upgrades pretty much done
and fixed a conflict