And more mapping improvements