more fixes, more macros, yadda yadda
the refactor is almost ready but there remain a few errors (seemingly)
v2 of the expander seems to be able to compile everything properly
blanked out obsolete files
cleanup