fixups incremental
better debug
incremental wip