misc stuff I'd apparently forgotten to push