fix display, clean up a little