Fixed some stuff with commands