heapless builds after F.top --> fTop shift. lets run tests...
ugh. catSubst error causes problems
misc edits, checked against subst branch in fixpoint