naming conventions and minor fixes