route matching simplification.
added exception messages.
code cleanup.