removed ckeditor/override, few other small changes