2_0_1 update - lots of fixes