many fixes
miscellaneous
commit stuff i didn't end up using
dump