More fixes, added group management (not working yet)