Final Changes

Hope this is all. May have to delete something.