fixes and changed way we store data