Various fixes

SECRET: /battle command (probably broken)