Feature/more rotation tweaks