Bug fix for optional clauses => needed an lstrip after changes to non-greedy regex
Add date = today functionality