I'll merge this stuff in tracking for now, as there's some other stuff I'm working on and want these latest changes in.