a bunch more consistency fixes