Converted maps to list comprehensions.  Fixed some cases of duplicate entries.
Converted maps to list comprehensions.  Fixed some cases of duplicate entries.

ddierschow/bamca,ddierschow/bamca,ddierschow/bamca,ddierschow/bamca,ddierschow/bamca