last minute fixes -- frozen now for all time, as the data is in the DB