minor fixes to confirm to proposal