small fixes based on testing