fixed performance issues with text rendering in windows
small comment fix
Merge