small fixes. prep for key classes.