naming conventions and some minor errors