minor rewrites, rethinking some things, no major additions to API features.
adapted tool to rethinking of db model functions.