a bunch of minor updates

this should make things a little cleaner going forward