Fixed service, moved things into the controller where they belong.
Fixed a spelling error across everything.