Refactored Shop (2nd pass), should be good to go with new augment system.
Missed some small crap