- fix warning about local scope - make the angles a PropertyAngle to handle the unit - also fix some too long code lines