Fix HD Remasters and tidy up. This should be the final commit for the preliminary support, no further coding style issues withstanding.