art implemented plus a bunch of other upgrades