Clean up debugging, correct display scaling