Revamp README, clean up map.h, add MAP prefixes