Enums refactored. Angle calculation changed.