Remove some comments, fix rotation, restore commented functionality