documentation woo
improvements to internal naming, plus some tweaks