last minute changes and fixes