Pack of small fixes and improvements + Alternative implementation of text highlighting which works faster than currently but unstable for now and commented out.