More changes

Note - Serious loading errors related to other parts of
defaultunits.lua, meaning this is not hooking properly. Same for the
AdjacencyBuff.lua change to remove Storage, that is detected as a
duplicate and returning an error, despite working.