Minor updates based on group feedback