Fixed string highlighting and added TODO
Added haddock comment highlighting