Updated to 1.7.2, various fixes

Code formatting from original decompile