Fixed bugs, new command