updated and fixed samples