[Closes #25] Minor fixes/cleanup to hashes and arrays

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