Some map improvements