fixes after rebase && Analysis: while- & do-loop