Enums for upgrades, new images, small fixes

Just backing up my work as I go