Fixed commands, broke things, etc. Also merged with @HmmmQuestionMark's
commit.