Add comment styles which self-close (like HTML and multi line CSS). Clean up code and add more tests of parser.