mapping improvements