Added cannons, removed commented out code, other small stuff.