Bit of cleanup and minor fixes, also fixed input redraw issue