Correcting Fixes

Repairing and adjusting some of the changes made.