trying to optimise overrides
code cleanup
item/building overrides greatly optimised