Ok, that tidied up a few things.
BUILD: more tweaks
BUILD: debugged and fixed