Lots of fixes inbound.

Lots of fixes inbound and changes.