added some sample data, also fixed a lot of bugs.