FIxed rotation problems and improved checking