added rough 'group' format option
added rough 'group' format option - small comments and fixes