Improving editing and more