Rearrange, some bugfixes to data storage