Added command, fixed some other stuffs