Updated text parse rules (see https://docs.google.com/document/d/1B5Rj0brL1GSBvRtaesAPhiHfehOP7IT93ZWX1cHcHZc/edit)