added cmdline, fixed formatting