Dowhile

Some small changes, why did I create a branch?