Readjusting some code and fixing up the display some more