more porting of 1.6.4 mod to 1.7.2 - still loads to go :(