removed rotation errors
removed more bugs