-Fixed: resolving command name
minor changes