Minor Bugfixes/Laying Groundwork for Finalization of Programs Functionality