Merge tweaks

Modified a few files to finish merging score chapter and endgame
chapters into the master branch