- Some optimizations & editor crash fix