added the angles, changed some things