Group Directory Polishing

+ Bugfixes and style improvements