fixes based on feedback from @repeatedly