#65: work ongoing + cleanup