mode1 clean up and GUI work