update/bugfix various fn name & namespace changes, type references etc. (WIP commit, backup from old MBP drive)