fix: various fixes to the store and model