-- added some more goodies to map