indentation
minor cleanups
ability to route to callables
test callables