more clean up; cmdline works