Consolidate relevant work from other forks.

[randysecrist]

Some interesting segments and features have been added to other more recent forks. We should consolidate these. What should I work on to merge in? Comments welcome.