final changes and fixes to core fields. Devs should re-install as this is a DB change. Upgrade logic supplied for @ja