do some designfixes and add delete user/group logic