minor organisational changes + commentary