Some minor tweaks, and commented out subprograms / globals