Locationfix

Further refactor and fixes to `ngModelController`.