Prep for release

Merge bug fixes and improvements for the first release down to master.