fixes for group code