refactored entrygroup and some other fixes