small changes to angle calcs