Almost ready for store

Lots of updates too much to list but its very close to ready to submit