need a better place to store DISPLAY
misc changes