Changes for Ember-Data to work
added comments and changes(ish)