fixes based on testing