bug fixes, added sample data