nicer foldtext and timeout fixes