editor + generator enhancements