fixed some other commands, too