trim
add ng-components
add all back
some tidy up