Bugfixes and Formatting

Addressed bugs with setting/loading the generation input values.

Changed spacing in a couple of files for clarity and consistency