Changes in preparation of 1.1.0 release...
Lots of cleanup for 1.1.0