Some last minute changes and cleaning up