add some comments
more hacking on main_curses
Merge branch 'master' into dev
stuff