More cleanup. Fixed an issue where rotation would cause the number to begin drawing the next number. Lots of misc cleanup as well