added more sample data and functionality

lots of changes and bug fixes, updates