Some more minor changes to polish off the program a bit...