cleaned up map interface and related classes.