Fixed errors in the new Trader Code. Fixed the Squire Bug (Big thanks to Nightinggale!)