fixed "-e" command (it should use all following args); some cosmetic fixes