bugfix, code cleaning, switch models to notes included routes,