Tweaks, workaround for 'do while' for now