Improvements, rotation is funky