a bunch of updates

yes, we know we should be committing smaller things