Nail down regexp logic
Commentary update