More forgeeditor changes, I'm satisfied with it now