upgrades, fixes
forgot to add some stuff