Updates to orientation calculation and readability