MAJOR: fixed all collisions, rotations and clean