fix quality issues