Merge pull request #79 from jsouthworth/fix/78

Fix a few bugs related to storing values.