Fixed all the major bugswith angles