Refactored Hashes and Arrays to close #25

@doomspork here is the fix for issue #25, as well as some cleanup on some other hashes.