minor fixes, data storage