made a few changes at once

sorry, no individual commits made