Bug fix + Text Editor