cleaned up map package a bit