some commands fixed