fixes based on feedback from Ben B.