Some code cleaning
More cleaning
Two units !
Corrected the bug crashing the game when clicking out of the map