1.60.7.2.1 - lots of fixes