small fixes based on John B review