Comments support, white lines, improved grep pattern