add some more sample data
fix a couple of bugs