Fix a couple bugs, add a sense of a store to have global app data