all the maps
only support java.util collections
fixed comments and other clean up