Some minor edits and gussy ups