Add rotation among other fixes