Reorganized source, improved parsing, extra sentences.

Thanks to @sellensr for the continued work, plus @edgar-bonet and @optorres for additional improvements.