re #20 Small improvements.