Fixed major errors in command package