updates to polk; mapping improvements