improvements and simplification
added named routes, other improvements