Compilator near-finished enhancements