1.60.7.1.9 lots of fixes