update; my branch is (partially) debugged now