mishmash

please see commit messages