Finally got the display angles working correctly; also, code nicification
Added data output and fixed angle errors