Fully fixed samples class. Fixed bugs with samples usage.