Fixed bullshit angle assignments.
Cleaned up angle calculations.
Clean ups.