HALO : Cleanup and fixes ninja mode