q2: datafile open code completed
q1: comment style fix
q2: completed (in theory)
Merge branch 'q2'
Merge branch 'q1'