incremental fixes
reverted a bit
mostly fixed, for now
working~~~