Shoot Rotation & Refactoring

* Corrected Implementation of the rotation before and after shooting
* Mass refactor of Update