Fixed some rotation logic and fixed crits