added various last minute changes