Some final spelling changes and stuff