errors fixes
load order changes