more polishes, fix ckeditor