Added shield and fixed up shop