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