fixes on review