abstract a couple of other small things