Fix bad rebase, remove debug prints and fix out of order print