relatively small amount of stuff

merging a few of the things from #192, since that still needs some fixes before it's ready