Implemented reading groups from map files.
Minor changes.