added + improved some commands