fixed pathing, rotations still slightly busted
merged