fixes and made text edit-friendly