improved parser, better comments coverage for contributors