Fix for cannon not choosing the closest targets anymore
Cleaning up
Lots of refactoring