better naming, minor fixes