fixed some nasty bugs
That's what happens when you mix radians and degrees
Cleanup