rotation fix and some comments