updates, fiddling, tweaking.

committing this before breaking it again