Levelling issues fixed

Testing the upgrade level process and added tweaks before adding to main build