Added some last minute changes to the various files