comitted old last-minute changes; new maps