Work on #218: fix drawing bugs, update command line size and location.