fixed bugs from customer feedback