added the store and removed some comments and extraneous things