fixes based on feedback from Marcus