untangle code
adjust tests
rebootstrap