some renames/tweaks/updates/etc. commit is more broken than, well, something thats definitely broken. getting there, though.