Updated with sample data and some code changes

Sample data now included.
Fixed some minor bugs.