Fixed a couple of bugs with the data storage