update to 1.7.2 #2, lots of code fixes