More major revisions by ThyChef

Big thanks to ThyChef; I didn't do anything in this commit.