Added user/group and some fixes