fixed issues with command args