addressed a bunch more code reviews