various changes, include tinymce