fixed bug in router, finished renaming all internal references to .model to .viewModel