Added in Angular services and cleaned error messages