1. failing regression tests, from #164 and #107 2. implemented; tests pass 3. allow trailing comments