Adding HashMap module methods and refactored some small things.