fix broken commands, take two