Added and fixed a bunch of routes and model methods ...