bugfixes and changed normal storage format