much more cleanup. brute-force error fixing, _many_ things need
reworked/rewritten