Updated to 1.7. Also added some debug command stuff.