Minor tweaks, and fixed missing refreshDisplay.