Bug Fixes and added lots of stuff to the store