small fixes based on feedback