minor tweaks to finish coverage, and improve readability