made a few more things consistent, I think