Made fixes from group meeting.