Lots of cleanup and fixes for final release. Marks feature freeze for first release.