Fixed some autons.  Added more angles.  Fixed existing angles.
Merge origin/master