many map interface fixes