minor fixes based on testing