minor changes + bugfix from group