Fixes2.0

Fixes for version 2.0 release