Fixed some bugs and started changing the DataService a little