DK: small fixes & removing useless rotations