beta 2 store. Attempt to fix certain bugs