regex based date extraction and more fixes