Fixed issues with rotation and translation, but not application of either
Fixed conflicts