proper 2 step compensation phase, close #8 close #10 #11

(no time, no specs, no refactoring)