changes based on referee report

Smaller items, up to #28