minor fixes to version 2.0