Fixed rotation, removed some inculdes, comments