Fixed deletion bug
Fixed import + command args bug