add catapult types, clean up a bit of stuff...