moar pass test, and fixers
remove sophisticated debugging