fix commands highlighting and while initialization