big improvements to routine consistency and db dsl