fixes + angularish