Minor changes to the code and resulting files.