Redoing some fixes. Forgot to reload texteditor after pull