fixed some issues with do-statements