simplify stuff
WIP
hacks to reduce size, more cannons