improve engine mechanics and fix orientation bugs