more clean up; cmdline works
Merge pull request #2 from walterbender/master

more clean up; cmdline works