Some changes in commands + cleanup