rotation fix and others