Added more dummy data
Minor bugfixes