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