added some TODOs
changed rotation state order
removed optional semicolon