fixt the core-test file, it has references to a deleted function
moved a function and fixt a typo
got back into the code after long absence, found more things working correctly than I expected so I'm checkpointing wi/ no significant changes just b/c