WIP more fixes to store code + iOS seems to be working