Improve the RTE functionalities and behavior