samples added, bugs fixed