Fixed up Map. *Now* everything is in order. ping #12