Lots of updates for 008+.

This is in progress, so probably best not to pull it yet, but just wanted to put these updates on your radar.