Small merge
Another merge
Third commit, yay! <3 Emil (no, not really)
Merge
Fixes to cylinder and standardised rotation between mouse and keyboard.