Add some code reviews and minor fixes