A few tweaks. GMCP is almost ready to build! :D