Big cleanup and manoeuvrability tweaks