tweaks (feedback from @skrugman)