more fixes based on testing