Updates to store and a few other things