Expand permission heiarchy to include subgroups and parent groups
Miscellaneous fixes/improvements