nickel 0.1.1 → 0.1.2

data/lib/nickel/construct_interpreter.rb

@@ -2,9 +2,7 @@ require_relative 'occurrence'
 require_relative 'construct'
 
 module Nickel
-
   class ConstructInterpreter
-
     attr_reader :occurrences, :constructs, :curdate
 
     def initialize(constructs, curdate)
@@ -31,19 +29,20 @@ module Nickel
     end
 
     private
+
     def initialize_index_to_type_map
       # The @index_to_type_map hash looks like this: {0 => :date, 1 => :timespan, ...}
       # Each key represents the index in @constructs and the value represents that constructs class.
       @index_to_type_map = {}
-      @constructs.each_with_index do |c,i|
+      @constructs.each_with_index do |c, i|
         @index_to_type_map[i] = case c.class.name
-          when "Nickel::DateConstruct"         then :date
-          when "Nickel::TimeConstruct"         then :time
-          when "Nickel::DateSpanConstruct"     then :datespan
-          when "Nickel::TimeSpanConstruct"     then :timespan
-          when "Nickel::RecurrenceConstruct"   then :recurrence
-          when "Nickel::WrapperConstruct"      then :wrapper
-        end
+                                when 'Nickel::DateConstruct'         then :date
+                                when 'Nickel::TimeConstruct'         then :time
+                                when 'Nickel::DateSpanConstruct'     then :datespan
+                                when 'Nickel::TimeSpanConstruct'     then :timespan
+                                when 'Nickel::RecurrenceConstruct'   then :recurrence
+                                when 'Nickel::WrapperConstruct'      then :wrapper
+                                end
       end
     end
 
@@ -52,27 +51,27 @@ module Nickel
       # Determine user input style, i.e. "DATE TIME DATE TIME"  OR "TIME DATE TIME DATE".
       # Determine user input style, i.e. "DATE TIME DATE TIME"  OR "TIME DATE TIME DATE".
       case (@index_to_type_map[0] == :wrapper ? @index_to_type_map[1] : @index_to_type_map[0])
-        when :date        then @user_input_style = :datetime
-        when :time        then @user_input_style = :timedate
-        when :datespan    then @user_input_style = :datetime
-        when :timespan    then @user_input_style = :timedate
-        when :recurrence  then @user_input_style = :datetime
-        else
-          # We only have wrappers. It doesn't matter which user style we choose.
-          @user_input_style = :datetime
+      when :date        then @user_input_style = :datetime
+      when :time        then @user_input_style = :timedate
+      when :datespan    then @user_input_style = :datetime
+      when :timespan    then @user_input_style = :timedate
+      when :recurrence  then @user_input_style = :datetime
+      else
+        # We only have wrappers. It doesn't matter which user style we choose.
+        @user_input_style = :datetime
       end
     end
 
     def initialize_arrays_of_construct_indices
-      @dci,@tci,@dsci,@tsci,@rci,@wci = [],[],[],[],[],[]
+      @dci, @tci, @dsci, @tsci, @rci, @wci = [], [], [], [], [], []
       @index_to_type_map.each do |i, type|
         case type
-          when :date        then @dci  << i
-          when :time        then @tci  << i
-          when :datespan    then @dsci << i
-          when :timespan    then @tsci << i
-          when :recurrence  then @rci  << i
-          when :wrapper     then @wci  << i
+        when :date        then @dci  << i
+        when :time        then @tci  << i
+        when :datespan    then @dsci << i
+        when :timespan    then @tsci << i
+        when :recurrence  then @rci  << i
+        when :wrapper     then @wci  << i
         end
       end
     end
@@ -127,7 +126,7 @@ module Nickel
       # meaning move forward.
       if @user_input_style == :datetime     then index + 1
       elsif @user_input_style == :timedate  then index - 1
-      else raise "ConstructInterpreter#move_time_map_index says: @user_input_style is not valid"
+      else fail 'ConstructInterpreter#move_time_map_index says: @user_input_style is not valid'
       end
     end
 
@@ -138,7 +137,7 @@ module Nickel
       else
         # There are times for this date, use them for any indices marked as inherit_on.
         # Then clear the inherit_on array.
-        inherit_on.each {|k| @sorted_time_map[k] = @sorted_time_map[date_index]}
+        inherit_on.each { |k| @sorted_time_map[k] = @sorted_time_map[date_index] }
         inherit_on = []
       end
       inherit_on
@@ -169,7 +168,7 @@ module Nickel
       elsif index_references_timespan(tindex)
         return @constructs[tindex].start_time
       else
-        raise "ConstructInterpreter#start_time_from_tindex says: tindex does not reference a time or time span"
+        fail 'ConstructInterpreter#start_time_from_tindex says: tindex does not reference a time or time span'
       end
     end
 
@@ -193,7 +192,6 @@ module Nickel
     # One of this methods functions will be to assign proper am/pm values to time
     # and timespan constructs if they were not specified.
     def finalize_constructs
-
       # First assign am/pm values to timespan constructs independent of
       # other times in timemap.
       finalize_timespan_constructs
@@ -205,7 +203,7 @@ module Nickel
         # The time_indices array holds TimeConstruct and TimeSpanConstruct indices.
         # The time_array will hold an array of ZTime objects to modify (potentially)
         time_array = []
-        time_indices.each {|tindex| time_array << start_time_from_tindex(tindex)}
+        time_indices.each { |tindex| time_array << start_time_from_tindex(tindex) }
         ZTime.am_pm_modifier(*time_array)
       end
 
@@ -247,8 +245,8 @@ module Nickel
 
     def occurrences_from_dates
       @dci.each do |dindex|
-        occ_base = Occurrence.new(:type => :single, :start_date => @constructs[dindex].date)
-        create_occurrence_for_each_time_in_time_map(occ_base, dindex) {|occ| @occurrences << occ}
+        occ_base = Occurrence.new(type: :single, start_date: @constructs[dindex].date)
+        create_occurrence_for_each_time_in_time_map(occ_base, dindex) { |occ| @occurrences << occ }
       end
     end
 
@@ -257,11 +255,11 @@ module Nickel
     end
 
     def occurrences_from_one_date_span
-      occ_base = Occurrence.new(:type => :daily,
-                                :start_date => @constructs[@dsci[0]].start_date,
-                                :end_date => @constructs[@dsci[0]].end_date,
-                                :interval => 1)
-      create_occurrence_for_each_time_in_time_map(occ_base, @dsci[0]) {|occ| @occurrences << occ}
+      occ_base = Occurrence.new(type: :daily,
+                                start_date: @constructs[@dsci[0]].start_date,
+                                end_date: @constructs[@dsci[0]].end_date,
+                                interval: 1)
+      create_occurrence_for_each_time_in_time_map(occ_base, @dsci[0]) { |occ| @occurrences << occ }
     end
 
     def found_recurrences_and_optional_date_span
@@ -271,7 +269,7 @@ module Nickel
     def occurrences_from_recurrences_and_optional_date_span
       if @dsci.size == 1
         # If a date span exists, it functions as wrapper.
-        occ_base_opts = {:start_date => @constructs[@dsci[0]].start_date, :end_date => @constructs[@dsci[0]].end_date}
+        occ_base_opts = { start_date: @constructs[@dsci[0]].start_date, end_date: @constructs[@dsci[0]].end_date }
       else
         # Perhaps there are type 0 or type 1 wrappers to provide start/end dates.
         occ_base_opts = occ_base_opts_from_wrappers
@@ -284,7 +282,7 @@ module Nickel
           # but they must be merged with start/end dates, if supplied.
           occ_base = Occurrence.new(rec_occ_base_opts.merge(occ_base_opts))
           # Attach times:
-          create_occurrence_for_each_time_in_time_map(occ_base, rcindex) {|occ| @occurrences << occ}
+          create_occurrence_for_each_time_in_time_map(occ_base, rcindex) { |occ| @occurrences << occ }
         end
       end
     end
@@ -296,7 +294,7 @@ module Nickel
     end
 
     def occurrences_from_wrappers_only
-      occ_base = {:type => :daily, :interval => 1}
+      occ_base = { type: :daily, interval: 1 }
       @occurrences << Occurrence.new(occ_base.merge(occ_base_opts_from_wrappers))
     end
 
@@ -319,22 +317,22 @@ module Nickel
           if base_opts[:start_date].nil? && base_opts[:end_date].nil?   # span must start today
             base_opts[:start_date] = @curdate.dup
             base_opts[:end_date] = case @constructs[wi].wrapper_type
-              when 2 then @curdate.add_days(@constructs[wi].wrapper_length)
-              when 3 then @curdate.add_weeks(@constructs[wi].wrapper_length)
-              when 4 then @curdate.add_months(@constructs[wi].wrapper_length)
-            end
+                                   when 2 then @curdate.add_days(@constructs[wi].wrapper_length)
+                                   when 3 then @curdate.add_weeks(@constructs[wi].wrapper_length)
+                                   when 4 then @curdate.add_months(@constructs[wi].wrapper_length)
+                                   end
           elsif base_opts[:start_date] && base_opts[:end_date].nil?
             base_opts[:end_date] = case @constructs[wi].wrapper_type
-              when 2 then base_opts[:start_date].add_days(@constructs[wi].wrapper_length)
-              when 3 then base_opts[:start_date].add_weeks(@constructs[wi].wrapper_length)
-              when 4 then base_opts[:start_date].add_months(@constructs[wi].wrapper_length)
-            end
+                                   when 2 then base_opts[:start_date].add_days(@constructs[wi].wrapper_length)
+                                   when 3 then base_opts[:start_date].add_weeks(@constructs[wi].wrapper_length)
+                                   when 4 then base_opts[:start_date].add_months(@constructs[wi].wrapper_length)
+                                   end
           elsif base_opts[:start_date].nil? && base_opts[:end_date]    # for 6 months until jan 3rd
             base_opts[:start_date] = case @constructs[wi].wrapper_type
-              when 2 then base_opts[:end_date].sub_days(@constructs[wi].wrapper_length)
-              when 3 then base_opts[:end_date].sub_weeks(@constructs[wi].wrapper_length)
-              when 4 then base_opts[:end_date].sub_months(@constructs[wi].wrapper_length)
-            end
+                                     when 2 then base_opts[:end_date].sub_days(@constructs[wi].wrapper_length)
+                                     when 3 then base_opts[:end_date].sub_weeks(@constructs[wi].wrapper_length)
+                                     when 4 then base_opts[:end_date].sub_months(@constructs[wi].wrapper_length)
+                                     end
           end
         end
       end

data/lib/nickel/nlp.rb

@@ -6,16 +6,14 @@ require_relative 'construct_finder'
 require_relative 'construct_interpreter'
 
 module Nickel
-
   class NLP
-
     attr_reader :query, :input_date, :input_time, :nlp_query
     attr_reader :construct_finder, :construct_interpreter
     attr_reader :occurrences, :message
 
     def initialize(query, date_time = Time.now)
-      raise InvalidDateTimeError unless [DateTime, Time].include?(date_time.class)
-      str_time = date_time.strftime("%Y%m%dT%H%M%S")
+      fail InvalidDateTimeError unless [DateTime, Time].include?(date_time.class)
+      str_time = date_time.strftime('%Y%m%dT%H%M%S')
       validate_input query, str_time
       @query = query.dup
       @input_date = ZDate.new str_time[0..7]   # up to T, note format is already verified
@@ -33,8 +31,8 @@ module Nickel
       @construct_interpreter = ConstructInterpreter.new(@construct_finder.constructs, @input_date)  # input_date only needed for wrappers
       @construct_interpreter.run
 
-      @occurrences = @construct_interpreter.occurrences.each {|occ| occ.finalize(@input_date) }   # finds start and end dates
-      @occurrences.sort! {|x,y| if x.start_date > y.start_date then 1 elsif x.start_date < y.start_date then -1 else 0 end}    # sorts occurrences by start dat
+      @occurrences = @construct_interpreter.occurrences.each { |occ| occ.finalize(@input_date) }   # finds start and end dates
+      @occurrences.sort_by(&:start_date)
       @occurrences
     end
 
@@ -52,16 +50,16 @@ module Nickel
       # now iterate through constructs, blow away any words between positions comp_start and comp_end
       constructs.each do |c|
         # create a range between comp_start and comp_end, iterate through it and wipe out words between them
-        (c.comp_start..c.comp_end).each {|x| message_array[x] = nil}
+        (c.comp_start..c.comp_end).each { |x| message_array[x] = nil }
         # also wipe out words before comp start if it is something like in, at, on, or the
         if c.comp_start - 1 >= 0 && message_array[c.comp_start - 1] =~ /\b(from|in|at|on|the|are|is|for)\b/
           message_array[c.comp_start - 1] = nil
-          if $1 == "the" && c.comp_start - 2 >= 0 && message_array[c.comp_start - 2] =~ /\b(for|on)\b/    # for the next three days;  on the 27th;
+          if Regexp.last_match(1) == 'the' && c.comp_start - 2 >= 0 && message_array[c.comp_start - 2] =~ /\b(for|on)\b/    # for the next three days;  on the 27th;
             message_array[c.comp_start - 2] = nil
-            if $1 == "on" && c.comp_start - 3 >= 0 && message_array[c.comp_start - 3] =~ /\b(is|are)\b/         # is on the 28th;  are on the 21st and 22nd;
+            if Regexp.last_match(1) == 'on' && c.comp_start - 3 >= 0 && message_array[c.comp_start - 3] =~ /\b(is|are)\b/         # is on the 28th;  are on the 21st and 22nd;
               message_array[c.comp_start - 3] = nil
             end
-          elsif $1 == "on" && c.comp_start - 2 >= 0 && message_array[c.comp_start - 2] =~ /\b(is|are)\b/      # is on tuesday; are on tuesday and wed;
+          elsif Regexp.last_match(1) == 'on' && c.comp_start - 2 >= 0 && message_array[c.comp_start - 2] =~ /\b(is|are)\b/      # is on tuesday; are on tuesday and wed;
             message_array[c.comp_start - 2] = nil
           end
         end
@@ -70,40 +68,39 @@ module Nickel
       # reloop and wipe out words after end of constructs, if they are followed by another construct
       # note we already wiped out terms ahead of the constructs, so be sure to check for nil values, these indicate that a construct is followed by the nil
       constructs.each_with_index do |c, i|
-        if message_array[c.comp_end+1] && message_array[c.comp_end + 1] == "and"    # do something tomorrow and on friday
-          if message_array[c.comp_end + 2].nil? || (constructs[i+1] && constructs[i+1].comp_start == c.comp_end + 2)
+        if message_array[c.comp_end + 1] && message_array[c.comp_end + 1] == 'and'    # do something tomorrow and on friday
+          if message_array[c.comp_end + 2].nil? || (constructs[i + 1] && constructs[i + 1].comp_start == c.comp_end + 2)
             message_array[c.comp_end + 1] = nil
-          elsif message_array[c.comp_end + 2] == "also" && message_array[c.comp_end + 3].nil? || (constructs[i+1] && constructs[i+1].comp_start == c.comp_end + 3)    # do something tomorrow and also on friday
+          elsif message_array[c.comp_end + 2] == 'also' && message_array[c.comp_end + 3].nil? || (constructs[i + 1] && constructs[i + 1].comp_start == c.comp_end + 3)    # do something tomorrow and also on friday
             message_array[c.comp_end + 1] = nil
             message_array[c.comp_end + 2] = nil
           end
         end
       end
-      @message = message_array.compact.join(" ")   # remove nils and join the words with spaces
+      @message = message_array.compact.join(' ')   # remove nils and join the words with spaces
     end
 
     # returns any words in the query that appeared as input to their original case
     def correct_case
       orig = @query.split
       latest = @message.split
-      orig.each_with_index do |original_word,j|
+      orig.each_with_index do |original_word, j|
         if i = latest.index(original_word.downcase)
           latest[i] = original_word
         end
       end
-      @message = latest.join(" ")
+      @message = latest.join(' ')
     end
 
-    def validate_input query, date_time
-      raise "Empty NLP query" unless query.length > 0
-      raise "NLP says: date_time is not in the correct format" unless date_time =~ /^\d{8}T\d{6}$/
+    def validate_input(query, date_time)
+      fail 'Empty NLP query' unless query.length > 0
+      fail 'NLP says: date_time is not in the correct format' unless date_time =~ /^\d{8}T\d{6}$/
     end
   end
 
   class InvalidDateTimeError < StandardError
     def message
-      "You must pass in a ruby DateTime or Time class object"
+      'You must pass in a ruby DateTime or Time class object'
     end
   end
 end
-

data/lib/nickel/nlp_query.rb

@@ -3,7 +3,6 @@ require_relative 'ztime'
 require_relative 'nlp_query_constants'
 
 module Nickel
-
   class NLPQuery
     include NLPQueryConstants
 
@@ -21,7 +20,7 @@ module Nickel
     end
 
     def query_formatting
-      query_str.gsub!(/\n/,'')
+      query_str.gsub!(/\n/, '')
       query_str.downcase!
       remove_unused_punctuation
       replace_backslashes
@@ -54,14 +53,14 @@ module Nickel
         if block_given?
           # query_str.gsub!(args[0]) {yield(*m.to_a[1..-1])}    # There is a bug here: If gsub matches more than once,
                                                       # then the first set of referenced matches will be passed to the block
-          ret_str = m.pre_match + m[0].sub(args[0]) {yield(*m.to_a[1..-1])}   # this will take care of the first set of matches
+          ret_str = m.pre_match + m[0].sub(args[0]) { yield(*m.to_a[1..-1]) }   # this will take care of the first set of matches
           while (m_old = m.dup) && (m = m.post_match.match(args[0]))
-            ret_str << m.pre_match + m[0].sub(args[0]) {yield(*m.to_a[1..-1])}
+            ret_str << m.pre_match + m[0].sub(args[0]) { yield(*m.to_a[1..-1]) }
           end
           ret_str << m_old.post_match
-          query_str.sub!(/.*/,ret_str)
+          query_str.sub!(/.*/, ret_str)
         else
-          query_str.gsub!(args[0],args[1])
+          query_str.gsub!(args[0], args[1])
         end
       end
     end
@@ -71,338 +70,338 @@ module Nickel
     end
 
     def remove_unused_punctuation
-      nsub!(/,/,' ')
-      nsub!(/\./,'')
-      nsub!(/;/,'')
-      nsub!(/['`]/,'')
+      nsub!(/,/, ' ')
+      nsub!(/\./, '')
+      nsub!(/;/, '')
+      nsub!(/['`]/, '')
     end
 
     def replace_backslashes
-      nsub!(/\\/,'/')
+      nsub!(/\\/, '/')
     end
 
     def run_spell_check
-      nsub!(/tomm?orr?ow|romorrow/,'tomorrow')
-      nsub!(/weeknd/,'weekend')
-      nsub!(/weekends/,'every sat sun')
-      nsub!(/everyother/,'every other')
-      nsub!(/weak/,'week')
-      nsub!(/everyweek/,'every week')
-      nsub!(/everymonth/,'every month')
-      nsub!(/c?h[oa]nn?[aui][ck][ck]?[ua]h?/,'hannukkah')
-      nsub!(/frist/,'1st')
-      nsub!(/eveyr|evrey/,'every')
-      nsub!(/fridya|friady|fridy/,'friday')
-      nsub!(/thurdsday/,'thursday')
-      nsub!(/x-?mas/,'christmas')
-      nsub!(/st\s+(patrick|patty|pat)s?(\s+day)?/,'st patricks day')
-      nsub!(/frouth/,'fourth')
-      nsub!(/\btill\b/,'through')
-      nsub!(/\bthru\b|\bthrouh\b|\bthough\b|\bthrew\b|\bthrow\b|\bthroug\b|\bthuogh\b/,'through')
-      nsub!(/weekdays|every\s+weekday/,'every monday through friday')
-      nsub!(/\bevery?day\b/,'every day')
-      nsub!(/eigth/,'eighth')
-      nsub!(/bi[-\s]monthly/,'bimonthly')
-      nsub!(/tri[-\s]monthly/,'trimonthly')
+      nsub!(/tomm?orr?ow|romorrow/, 'tomorrow')
+      nsub!(/weeknd/, 'weekend')
+      nsub!(/weekends/, 'every sat sun')
+      nsub!(/everyother/, 'every other')
+      nsub!(/weak/, 'week')
+      nsub!(/everyweek/, 'every week')
+      nsub!(/everymonth/, 'every month')
+      nsub!(/c?h[oa]nn?[aui][ck][ck]?[ua]h?/, 'hannukkah')
+      nsub!(/frist/, '1st')
+      nsub!(/eveyr|evrey/, 'every')
+      nsub!(/fridya|friady|fridy/, 'friday')
+      nsub!(/thurdsday/, 'thursday')
+      nsub!(/x-?mas/, 'christmas')
+      nsub!(/st\s+(patrick|patty|pat)s?(\s+day)?/, 'st patricks day')
+      nsub!(/frouth/, 'fourth')
+      nsub!(/\btill\b/, 'through')
+      nsub!(/\bthru\b|\bthrouh\b|\bthough\b|\bthrew\b|\bthrow\b|\bthroug\b|\bthuogh\b/, 'through')
+      nsub!(/weekdays|every\s+weekday/, 'every monday through friday')
+      nsub!(/\bevery?day\b/, 'every day')
+      nsub!(/eigth/, 'eighth')
+      nsub!(/bi[-\s]monthly/, 'bimonthly')
+      nsub!(/tri[-\s]monthly/, 'trimonthly')
     end
 
     def remove_unnecessary_words
-      nsub!(/coming/,'')
-      nsub!(/o'?clock/,'')
-      nsub!(/\btom\b/,'tomorrow')
-      nsub!(/\s*in\s+(the\s+)?(morning|am)/,' am')
-      nsub!(/\s*in\s+(the\s+)?(afternoon|pm|evenn?ing)/,' pm')
-      nsub!(/\s*at\s+night/,'pm')
-      nsub!(/(after\s*)?noon(ish)?/,'12:00pm')
-      nsub!(/\bmi(dn|nd)ight\b/,'12:00am')
-      nsub!(/final/,'last')
-      nsub!(/recur(s|r?ing)?/,'repeats')
-      nsub!(/\beach\b/,'every')
-      nsub!(/running\s+(until|through)/,'through')
-      nsub!(/runn?(s|ing)|go(ing|e?s)/,'for')
-      nsub!(/next\s+occ?urr?[ae]nce(\s+is)?/,'start')
-      nsub!(/next\s+date(\s+it)?(\s+occ?urr?s)?(\s+is)?/,'start')
-      nsub!(/forever/,'repeats daily')
-      nsub!(/\bany(?:\s*)day\b/,'every day')
-      nsub!(/^anytime$/,'every day')  # user entered anytime by itself, not 'dayname anytime', caught next
-      nsub!(/any(\s)?time|whenever/,'all day')
+      nsub!(/coming/, '')
+      nsub!(/o'?clock/, '')
+      nsub!(/\btom\b/, 'tomorrow')
+      nsub!(/\s*in\s+(the\s+)?(morning|am)/, ' am')
+      nsub!(/\s*in\s+(the\s+)?(afternoon|pm|evenn?ing)/, ' pm')
+      nsub!(/\s*at\s+night/, 'pm')
+      nsub!(/(after\s*)?noon(ish)?/, '12:00pm')
+      nsub!(/\bmi(dn|nd)ight\b/, '12:00am')
+      nsub!(/final/, 'last')
+      nsub!(/recur(s|r?ing)?/, 'repeats')
+      nsub!(/\beach\b/, 'every')
+      nsub!(/running\s+(until|through)/, 'through')
+      nsub!(/runn?(s|ing)|go(ing|e?s)/, 'for')
+      nsub!(/next\s+occ?urr?[ae]nce(\s+is)?/, 'start')
+      nsub!(/next\s+date(\s+it)?(\s+occ?urr?s)?(\s+is)?/, 'start')
+      nsub!(/forever/, 'repeats daily')
+      nsub!(/\bany(?:\s*)day\b/, 'every day')
+      nsub!(/^anytime$/, 'every day')  # user entered anytime by itself, not 'dayname anytime', caught next
+      nsub!(/any(\s)?time|whenever/, 'all day')
     end
 
     def standardize_days
-      nsub!(/mondays/,'every mon')
-      nsub!(/monday/,'mon')
-      nsub!(/tuesdays/,'every tue')
-      nsub!(/tuesadys/,'every tue')
-      nsub!(/tuesday/,'tue')
-      nsub!(/tuesady/,'tue')
-      nsub!(/wednesdays/,'every wed')
-      nsub!(/wednesday/,'wed')
-      nsub!(/thursdays/,'every thu')
-      nsub!(/thurdsays/,'every thu')
-      nsub!(/thursadys/,'every thu')
-      nsub!(/thursday/,'thu')
-      nsub!(/thurdsay/,'thu')
-      nsub!(/thursady/,'thu')
-      nsub!(/\bthurd?\b/,'thu')
-      nsub!(/\bthurs?d?\b/,'thu')
-      nsub!(/fridays/,'every fri')
-      nsub!(/firdays/,'every fri')
-      nsub!(/friday/,'fri')
-      nsub!(/firday/,'fri')
-      nsub!(/saturdays/,'every sat')
-      nsub!(/saturday/,'sat')
-      nsub!(/sundays/,'every sun')
-      nsub!(/sunday/,'sun')
+      nsub!(/mondays/, 'every mon')
+      nsub!(/monday/, 'mon')
+      nsub!(/tuesdays/, 'every tue')
+      nsub!(/tuesadys/, 'every tue')
+      nsub!(/tuesday/, 'tue')
+      nsub!(/tuesady/, 'tue')
+      nsub!(/wednesdays/, 'every wed')
+      nsub!(/wednesday/, 'wed')
+      nsub!(/thursdays/, 'every thu')
+      nsub!(/thurdsays/, 'every thu')
+      nsub!(/thursadys/, 'every thu')
+      nsub!(/thursday/, 'thu')
+      nsub!(/thurdsay/, 'thu')
+      nsub!(/thursady/, 'thu')
+      nsub!(/\bthurd?\b/, 'thu')
+      nsub!(/\bthurs?d?\b/, 'thu')
+      nsub!(/fridays/, 'every fri')
+      nsub!(/firdays/, 'every fri')
+      nsub!(/friday/, 'fri')
+      nsub!(/firday/, 'fri')
+      nsub!(/saturdays/, 'every sat')
+      nsub!(/saturday/, 'sat')
+      nsub!(/sundays/, 'every sun')
+      nsub!(/sunday/, 'sun')
     end
 
     def standardize_months
-      nsub!(/january/,'jan')
-      nsub!(/february/,'feb')
+      nsub!(/january/, 'jan')
+      nsub!(/february/, 'feb')
       nsub!(/febr/, 'feb')
-      nsub!(/march/,'mar')
-      nsub!(/april/,'apr')
-      nsub!(/may/,'may')
-      nsub!(/june/,'jun')
-      nsub!(/july/,'jul')
-      nsub!(/august/,'aug')
-      nsub!(/september/,'sep')
-      nsub!(/sept/,'sep')
-      nsub!(/october/,'oct')
-      nsub!(/november/,'nov')
-      nsub!(/novermber/,'nov')
-      nsub!(/novem/,'nov')
-      nsub!(/decemb?e?r?/,'dec')
+      nsub!(/march/, 'mar')
+      nsub!(/april/, 'apr')
+      nsub!(/may/, 'may')
+      nsub!(/june/, 'jun')
+      nsub!(/july/, 'jul')
+      nsub!(/august/, 'aug')
+      nsub!(/september/, 'sep')
+      nsub!(/sept/, 'sep')
+      nsub!(/october/, 'oct')
+      nsub!(/november/, 'nov')
+      nsub!(/novermber/, 'nov')
+      nsub!(/novem/, 'nov')
+      nsub!(/decemb?e?r?/, 'dec')
     end
 
     def standardize_numbers
-      nsub!(/\bone\s*-?\s*hundred\b/,'100')
-      nsub!(/\bone\s*-?\s*hundredth\b/,'100th')
-      nsub!(/\bninety\s*-?\s*nine\b/,'99')
-      nsub!(/\bninety\s*-?\s*ninth\b/,'99th')
-      nsub!(/\bninety\s*-?\s*eight\b/,'98')
-      nsub!(/\bninety\s*-?\s*eighth\b/,'98th')
-      nsub!(/\bninety\s*-?\s*seven\b/,'97')
-      nsub!(/\bninety\s*-?\s*seventh\b/,'97th')
-      nsub!(/\bninety\s*-?\s*six\b/,'96')
-      nsub!(/\bninety\s*-?\s*sixth\b/,'96th')
-      nsub!(/\bninety\s*-?\s*five\b/,'95')
-      nsub!(/\bninety\s*-?\s*fifth\b/,'95th')
-      nsub!(/\bninety\s*-?\s*four\b/,'94')
-      nsub!(/\bninety\s*-?\s*fourth\b/,'94th')
-      nsub!(/\bninety\s*-?\s*three\b/,'93')
-      nsub!(/\bninety\s*-?\s*third\b/,'93rd')
-      nsub!(/\bninety\s*-?\s*two\b/,'92')
-      nsub!(/\bninety\s*-?\s*second\b/,'92nd')
-      nsub!(/\bninety\s*-?\s*one\b/,'91')
-      nsub!(/\bninety\s*-?\s*first\b/,'91st')
-      nsub!(/\bninety\b/,'90')
-      nsub!(/\bninetieth\b/,'90th')
-      nsub!(/\beighty\s*-?\s*nine\b/,'89')
-      nsub!(/\beighty\s*-?\s*ninth\b/,'89th')
-      nsub!(/\beighty\s*-?\s*eight\b/,'88')
-      nsub!(/\beighty\s*-?\s*eighth\b/,'88th')
-      nsub!(/\beighty\s*-?\s*seven\b/,'87')
-      nsub!(/\beighty\s*-?\s*seventh\b/,'87th')
-      nsub!(/\beighty\s*-?\s*six\b/,'86')
-      nsub!(/\beighty\s*-?\s*sixth\b/,'86th')
-      nsub!(/\beighty\s*-?\s*five\b/,'85')
-      nsub!(/\beighty\s*-?\s*fifth\b/,'85th')
-      nsub!(/\beighty\s*-?\s*four\b/,'84')
-      nsub!(/\beighty\s*-?\s*fourth\b/,'84th')
-      nsub!(/\beighty\s*-?\s*three\b/,'83')
-      nsub!(/\beighty\s*-?\s*third\b/,'83rd')
-      nsub!(/\beighty\s*-?\s*two\b/,'82')
-      nsub!(/\beighty\s*-?\s*second\b/,'82nd')
-      nsub!(/\beighty\s*-?\s*one\b/,'81')
-      nsub!(/\beighty\s*-?\s*first\b/,'81st')
-      nsub!(/\beighty\b/,'80')
-      nsub!(/\beightieth\b/,'80th')
-      nsub!(/\bseventy\s*-?\s*nine\b/,'79')
-      nsub!(/\bseventy\s*-?\s*ninth\b/,'79th')
-      nsub!(/\bseventy\s*-?\s*eight\b/,'78')
-      nsub!(/\bseventy\s*-?\s*eighth\b/,'78th')
-      nsub!(/\bseventy\s*-?\s*seven\b/,'77')
-      nsub!(/\bseventy\s*-?\s*seventh\b/,'77th')
-      nsub!(/\bseventy\s*-?\s*six\b/,'76')
-      nsub!(/\bseventy\s*-?\s*sixth\b/,'76th')
-      nsub!(/\bseventy\s*-?\s*five\b/,'75')
-      nsub!(/\bseventy\s*-?\s*fifth\b/,'75th')
-      nsub!(/\bseventy\s*-?\s*four\b/,'74')
-      nsub!(/\bseventy\s*-?\s*fourth\b/,'74th')
-      nsub!(/\bseventy\s*-?\s*three\b/,'73')
-      nsub!(/\bseventy\s*-?\s*third\b/,'73rd')
-      nsub!(/\bseventy\s*-?\s*two\b/,'72')
-      nsub!(/\bseventy\s*-?\s*second\b/,'72nd')
-      nsub!(/\bseventy\s*-?\s*one\b/,'71')
-      nsub!(/\bseventy\s*-?\s*first\b/,'71st')
-      nsub!(/\bseventy\b/,'70')
-      nsub!(/\bseventieth\b/,'70th')
-      nsub!(/\bsixty\s*-?\s*nine\b/,'69')
-      nsub!(/\bsixty\s*-?\s*ninth\b/,'69th')
-      nsub!(/\bsixty\s*-?\s*eight\b/,'68')
-      nsub!(/\bsixty\s*-?\s*eighth\b/,'68th')
-      nsub!(/\bsixty\s*-?\s*seven\b/,'67')
-      nsub!(/\bsixty\s*-?\s*seventh\b/,'67th')
-      nsub!(/\bsixty\s*-?\s*six\b/,'66')
-      nsub!(/\bsixty\s*-?\s*sixth\b/,'66th')
-      nsub!(/\bsixty\s*-?\s*five\b/,'65')
-      nsub!(/\bsixty\s*-?\s*fifth\b/,'65th')
-      nsub!(/\bsixty\s*-?\s*four\b/,'64')
-      nsub!(/\bsixty\s*-?\s*fourth\b/,'64th')
-      nsub!(/\bsixty\s*-?\s*three\b/,'63')
-      nsub!(/\bsixty\s*-?\s*third\b/,'63rd')
-      nsub!(/\bsixty\s*-?\s*two\b/,'62')
-      nsub!(/\bsixty\s*-?\s*second\b/,'62nd')
-      nsub!(/\bsixty\s*-?\s*one\b/,'61')
-      nsub!(/\bsixty\s*-?\s*first\b/,'61st')
-      nsub!(/\bsixty\b/,'60')
-      nsub!(/\bsixtieth\b/,'60th')
-      nsub!(/\bfifty\s*-?\s*nine\b/,'59')
-      nsub!(/\bfifty\s*-?\s*ninth\b/,'59th')
-      nsub!(/\bfifty\s*-?\s*eight\b/,'58')
-      nsub!(/\bfifty\s*-?\s*eighth\b/,'58th')
-      nsub!(/\bfifty\s*-?\s*seven\b/,'57')
-      nsub!(/\bfifty\s*-?\s*seventh\b/,'57th')
-      nsub!(/\bfifty\s*-?\s*six\b/,'56')
-      nsub!(/\bfifty\s*-?\s*sixth\b/,'56th')
-      nsub!(/\bfifty\s*-?\s*five\b/,'55')
-      nsub!(/\bfifty\s*-?\s*fifth\b/,'55th')
-      nsub!(/\bfifty\s*-?\s*four\b/,'54')
-      nsub!(/\bfifty\s*-?\s*fourth\b/,'54th')
-      nsub!(/\bfifty\s*-?\s*three\b/,'53')
-      nsub!(/\bfifty\s*-?\s*third\b/,'53rd')
-      nsub!(/\bfifty\s*-?\s*two\b/,'52')
-      nsub!(/\bfifty\s*-?\s*second\b/,'52nd')
-      nsub!(/\bfifty\s*-?\s*one\b/,'51')
-      nsub!(/\bfifty\s*-?\s*first\b/,'51st')
-      nsub!(/\bfifty\b/,'50')
-      nsub!(/\bfiftieth\b/,'50th')
-      nsub!(/\bfourty\s*-?\s*nine\b/,'49')
-      nsub!(/\bfourty\s*-?\s*ninth\b/,'49th')
-      nsub!(/\bfourty\s*-?\s*eight\b/,'48')
-      nsub!(/\bfourty\s*-?\s*eighth\b/,'48th')
-      nsub!(/\bfourty\s*-?\s*seven\b/,'47')
-      nsub!(/\bfourty\s*-?\s*seventh\b/,'47th')
-      nsub!(/\bfourty\s*-?\s*six\b/,'46')
-      nsub!(/\bfourty\s*-?\s*sixth\b/,'46th')
-      nsub!(/\bfourty\s*-?\s*five\b/,'45')
-      nsub!(/\bfourty\s*-?\s*fifth\b/,'45th')
-      nsub!(/\bfourty\s*-?\s*four\b/,'44')
-      nsub!(/\bfourty\s*-?\s*fourth\b/,'44th')
-      nsub!(/\bfourty\s*-?\s*three\b/,'43')
-      nsub!(/\bfourty\s*-?\s*third\b/,'43rd')
-      nsub!(/\bfourty\s*-?\s*two\b/,'42')
-      nsub!(/\bfourty\s*-?\s*second\b/,'42nd')
-      nsub!(/\bfourty\s*-?\s*one\b/,'41')
-      nsub!(/\bfourty\s*-?\s*first\b/,'41st')
-      nsub!(/\bfourty\b/,'40')
-      nsub!(/\bfourtieth\b/,'40th')
-      nsub!(/\bthirty\s*-?\s*nine\b/,'39')
-      nsub!(/\bthirty\s*-?\s*ninth\b/,'39th')
-      nsub!(/\bthirty\s*-?\s*eight\b/,'38')
-      nsub!(/\bthirty\s*-?\s*eighth\b/,'38th')
-      nsub!(/\bthirty\s*-?\s*seven\b/,'37')
-      nsub!(/\bthirty\s*-?\s*seventh\b/,'37th')
-      nsub!(/\bthirty\s*-?\s*six\b/,'36')
-      nsub!(/\bthirty\s*-?\s*sixth\b/,'36th')
-      nsub!(/\bthirty\s*-?\s*five\b/,'35')
-      nsub!(/\bthirty\s*-?\s*fifth\b/,'35th')
-      nsub!(/\bthirty\s*-?\s*four\b/,'34')
-      nsub!(/\bthirty\s*-?\s*fourth\b/,'34th')
-      nsub!(/\bthirty\s*-?\s*three\b/,'33')
-      nsub!(/\bthirty\s*-?\s*third\b/,'33rd')
-      nsub!(/\bthirty\s*-?\s*two\b/,'32')
-      nsub!(/\bthirty\s*-?\s*second\b/,'32nd')
-      nsub!(/\bthirty\s*-?\s*one\b/,'31')
-      nsub!(/\bthirty\s*-?\s*first\b/,'31st')
-      nsub!(/\bthirty\b/,'30')
-      nsub!(/\bthirtieth\b/,'30th')
-      nsub!(/\btwenty\s*-?\s*nine\b/,'29')
-      nsub!(/\btwenty\s*-?\s*ninth\b/,'29th')
-      nsub!(/\btwenty\s*-?\s*eight\b/,'28')
-      nsub!(/\btwenty\s*-?\s*eighth\b/,'28th')
-      nsub!(/\btwenty\s*-?\s*seven\b/,'27')
-      nsub!(/\btwenty\s*-?\s*seventh\b/,'27th')
-      nsub!(/\btwenty\s*-?\s*six\b/,'26')
-      nsub!(/\btwenty\s*-?\s*sixth\b/,'26th')
-      nsub!(/\btwenty\s*-?\s*five\b/,'25')
-      nsub!(/\btwenty\s*-?\s*fifth\b/,'25th')
-      nsub!(/\btwenty\s*-?\s*four\b/,'24')
-      nsub!(/\btwenty\s*-?\s*fourth\b/,'24th')
-      nsub!(/\btwenty\s*-?\s*three\b/,'23')
-      nsub!(/\btwenty\s*-?\s*third\b/,'23rd')
-      nsub!(/\btwenty\s*-?\s*two\b/,'22')
-      nsub!(/\btwenty\s*-?\s*second\b/,'22nd')
-      nsub!(/\btwenty\s*-?\s*one\b/,'21')
-      nsub!(/\btwenty\s*-?\s*first\b/,'21st')
-      nsub!(/\btwenty\b/,'20')
-      nsub!(/\btwentieth\b/,'20th')
-      nsub!(/\bnineteen\b/,'19')
-      nsub!(/\bnineteenth\b/,'19th')
-      nsub!(/\beighteen\b/,'18')
-      nsub!(/\beighteenth\b/,'18th')
-      nsub!(/\bseventeen\b/,'17')
-      nsub!(/\bseventeenth\b/,'17th')
-      nsub!(/\bsixteen\b/,'16')
-      nsub!(/\bsixteenth\b/,'16th')
-      nsub!(/\bfifteen\b/,'15')
-      nsub!(/\bfifteenth\b/,'15th')
-      nsub!(/\bfourteen\b/,'14')
-      nsub!(/\bfourteenth\b/,'14th')
-      nsub!(/\bthirteen/,'13')
-      nsub!(/\bthirteenth/,'13th')
-      nsub!(/\btwelve\b/,'12')
-      nsub!(/\btwelfth\b/,'12th')
-      nsub!(/\beleven\b/,'11')
-      nsub!(/\beleventh\b/,'11th')
-      nsub!(/\bten\b/,'10')
-      nsub!(/\btenth\b/,'10th')
-      nsub!(/\bnine\b/,'9')
-      nsub!(/\bninth\b/,'9th')
-      nsub!(/\beight\b/,'8')
-      nsub!(/\beighth\b/,'8th')
-      nsub!(/\bseven\b/,'7')
-      nsub!(/\bseventh\b/,'7th')
-      nsub!(/\bsix\b/,'6')
-      nsub!(/\bsixth\b/,'6th')
-      nsub!(/\bfive\b/,'5')
-      nsub!(/\bfifth\b/,'5th')
-      nsub!(/\bfour\b/,'4')
-      nsub!(/\bfourth\b/,'4th')
-      nsub!(/\bthree\b/,'3')
-      nsub!(/\bthird\b/,'3rd')
-      nsub!(/\btwo\b/,'2')
-      nsub!(/\bsecond\b/,'2nd')
-      nsub!(/\bone\b/,'1')
-      nsub!(/\bfirst\b/,'1st')
-      nsub!(/\bzero\b/,'0')
-      nsub!(/\bzeroth\b/,'0th')
+      nsub!(/\bone\s*-?\s*hundred\b/, '100')
+      nsub!(/\bone\s*-?\s*hundredth\b/, '100th')
+      nsub!(/\bninety\s*-?\s*nine\b/, '99')
+      nsub!(/\bninety\s*-?\s*ninth\b/, '99th')
+      nsub!(/\bninety\s*-?\s*eight\b/, '98')
+      nsub!(/\bninety\s*-?\s*eighth\b/, '98th')
+      nsub!(/\bninety\s*-?\s*seven\b/, '97')
+      nsub!(/\bninety\s*-?\s*seventh\b/, '97th')
+      nsub!(/\bninety\s*-?\s*six\b/, '96')
+      nsub!(/\bninety\s*-?\s*sixth\b/, '96th')
+      nsub!(/\bninety\s*-?\s*five\b/, '95')
+      nsub!(/\bninety\s*-?\s*fifth\b/, '95th')
+      nsub!(/\bninety\s*-?\s*four\b/, '94')
+      nsub!(/\bninety\s*-?\s*fourth\b/, '94th')
+      nsub!(/\bninety\s*-?\s*three\b/, '93')
+      nsub!(/\bninety\s*-?\s*third\b/, '93rd')
+      nsub!(/\bninety\s*-?\s*two\b/, '92')
+      nsub!(/\bninety\s*-?\s*second\b/, '92nd')
+      nsub!(/\bninety\s*-?\s*one\b/, '91')
+      nsub!(/\bninety\s*-?\s*first\b/, '91st')
+      nsub!(/\bninety\b/, '90')
+      nsub!(/\bninetieth\b/, '90th')
+      nsub!(/\beighty\s*-?\s*nine\b/, '89')
+      nsub!(/\beighty\s*-?\s*ninth\b/, '89th')
+      nsub!(/\beighty\s*-?\s*eight\b/, '88')
+      nsub!(/\beighty\s*-?\s*eighth\b/, '88th')
+      nsub!(/\beighty\s*-?\s*seven\b/, '87')
+      nsub!(/\beighty\s*-?\s*seventh\b/, '87th')
+      nsub!(/\beighty\s*-?\s*six\b/, '86')
+      nsub!(/\beighty\s*-?\s*sixth\b/, '86th')
+      nsub!(/\beighty\s*-?\s*five\b/, '85')
+      nsub!(/\beighty\s*-?\s*fifth\b/, '85th')
+      nsub!(/\beighty\s*-?\s*four\b/, '84')
+      nsub!(/\beighty\s*-?\s*fourth\b/, '84th')
+      nsub!(/\beighty\s*-?\s*three\b/, '83')
+      nsub!(/\beighty\s*-?\s*third\b/, '83rd')
+      nsub!(/\beighty\s*-?\s*two\b/, '82')
+      nsub!(/\beighty\s*-?\s*second\b/, '82nd')
+      nsub!(/\beighty\s*-?\s*one\b/, '81')
+      nsub!(/\beighty\s*-?\s*first\b/, '81st')
+      nsub!(/\beighty\b/, '80')
+      nsub!(/\beightieth\b/, '80th')
+      nsub!(/\bseventy\s*-?\s*nine\b/, '79')
+      nsub!(/\bseventy\s*-?\s*ninth\b/, '79th')
+      nsub!(/\bseventy\s*-?\s*eight\b/, '78')
+      nsub!(/\bseventy\s*-?\s*eighth\b/, '78th')
+      nsub!(/\bseventy\s*-?\s*seven\b/, '77')
+      nsub!(/\bseventy\s*-?\s*seventh\b/, '77th')
+      nsub!(/\bseventy\s*-?\s*six\b/, '76')
+      nsub!(/\bseventy\s*-?\s*sixth\b/, '76th')
+      nsub!(/\bseventy\s*-?\s*five\b/, '75')
+      nsub!(/\bseventy\s*-?\s*fifth\b/, '75th')
+      nsub!(/\bseventy\s*-?\s*four\b/, '74')
+      nsub!(/\bseventy\s*-?\s*fourth\b/, '74th')
+      nsub!(/\bseventy\s*-?\s*three\b/, '73')
+      nsub!(/\bseventy\s*-?\s*third\b/, '73rd')
+      nsub!(/\bseventy\s*-?\s*two\b/, '72')
+      nsub!(/\bseventy\s*-?\s*second\b/, '72nd')
+      nsub!(/\bseventy\s*-?\s*one\b/, '71')
+      nsub!(/\bseventy\s*-?\s*first\b/, '71st')
+      nsub!(/\bseventy\b/, '70')
+      nsub!(/\bseventieth\b/, '70th')
+      nsub!(/\bsixty\s*-?\s*nine\b/, '69')
+      nsub!(/\bsixty\s*-?\s*ninth\b/, '69th')
+      nsub!(/\bsixty\s*-?\s*eight\b/, '68')
+      nsub!(/\bsixty\s*-?\s*eighth\b/, '68th')
+      nsub!(/\bsixty\s*-?\s*seven\b/, '67')
+      nsub!(/\bsixty\s*-?\s*seventh\b/, '67th')
+      nsub!(/\bsixty\s*-?\s*six\b/, '66')
+      nsub!(/\bsixty\s*-?\s*sixth\b/, '66th')
+      nsub!(/\bsixty\s*-?\s*five\b/, '65')
+      nsub!(/\bsixty\s*-?\s*fifth\b/, '65th')
+      nsub!(/\bsixty\s*-?\s*four\b/, '64')
+      nsub!(/\bsixty\s*-?\s*fourth\b/, '64th')
+      nsub!(/\bsixty\s*-?\s*three\b/, '63')
+      nsub!(/\bsixty\s*-?\s*third\b/, '63rd')
+      nsub!(/\bsixty\s*-?\s*two\b/, '62')
+      nsub!(/\bsixty\s*-?\s*second\b/, '62nd')
+      nsub!(/\bsixty\s*-?\s*one\b/, '61')
+      nsub!(/\bsixty\s*-?\s*first\b/, '61st')
+      nsub!(/\bsixty\b/, '60')
+      nsub!(/\bsixtieth\b/, '60th')
+      nsub!(/\bfifty\s*-?\s*nine\b/, '59')
+      nsub!(/\bfifty\s*-?\s*ninth\b/, '59th')
+      nsub!(/\bfifty\s*-?\s*eight\b/, '58')
+      nsub!(/\bfifty\s*-?\s*eighth\b/, '58th')
+      nsub!(/\bfifty\s*-?\s*seven\b/, '57')
+      nsub!(/\bfifty\s*-?\s*seventh\b/, '57th')
+      nsub!(/\bfifty\s*-?\s*six\b/, '56')
+      nsub!(/\bfifty\s*-?\s*sixth\b/, '56th')
+      nsub!(/\bfifty\s*-?\s*five\b/, '55')
+      nsub!(/\bfifty\s*-?\s*fifth\b/, '55th')
+      nsub!(/\bfifty\s*-?\s*four\b/, '54')
+      nsub!(/\bfifty\s*-?\s*fourth\b/, '54th')
+      nsub!(/\bfifty\s*-?\s*three\b/, '53')
+      nsub!(/\bfifty\s*-?\s*third\b/, '53rd')
+      nsub!(/\bfifty\s*-?\s*two\b/, '52')
+      nsub!(/\bfifty\s*-?\s*second\b/, '52nd')
+      nsub!(/\bfifty\s*-?\s*one\b/, '51')
+      nsub!(/\bfifty\s*-?\s*first\b/, '51st')
+      nsub!(/\bfifty\b/, '50')
+      nsub!(/\bfiftieth\b/, '50th')
+      nsub!(/\bfourty\s*-?\s*nine\b/, '49')
+      nsub!(/\bfourty\s*-?\s*ninth\b/, '49th')
+      nsub!(/\bfourty\s*-?\s*eight\b/, '48')
+      nsub!(/\bfourty\s*-?\s*eighth\b/, '48th')
+      nsub!(/\bfourty\s*-?\s*seven\b/, '47')
+      nsub!(/\bfourty\s*-?\s*seventh\b/, '47th')
+      nsub!(/\bfourty\s*-?\s*six\b/, '46')
+      nsub!(/\bfourty\s*-?\s*sixth\b/, '46th')
+      nsub!(/\bfourty\s*-?\s*five\b/, '45')
+      nsub!(/\bfourty\s*-?\s*fifth\b/, '45th')
+      nsub!(/\bfourty\s*-?\s*four\b/, '44')
+      nsub!(/\bfourty\s*-?\s*fourth\b/, '44th')
+      nsub!(/\bfourty\s*-?\s*three\b/, '43')
+      nsub!(/\bfourty\s*-?\s*third\b/, '43rd')
+      nsub!(/\bfourty\s*-?\s*two\b/, '42')
+      nsub!(/\bfourty\s*-?\s*second\b/, '42nd')
+      nsub!(/\bfourty\s*-?\s*one\b/, '41')
+      nsub!(/\bfourty\s*-?\s*first\b/, '41st')
+      nsub!(/\bfourty\b/, '40')
+      nsub!(/\bfourtieth\b/, '40th')
+      nsub!(/\bthirty\s*-?\s*nine\b/, '39')
+      nsub!(/\bthirty\s*-?\s*ninth\b/, '39th')
+      nsub!(/\bthirty\s*-?\s*eight\b/, '38')
+      nsub!(/\bthirty\s*-?\s*eighth\b/, '38th')
+      nsub!(/\bthirty\s*-?\s*seven\b/, '37')
+      nsub!(/\bthirty\s*-?\s*seventh\b/, '37th')
+      nsub!(/\bthirty\s*-?\s*six\b/, '36')
+      nsub!(/\bthirty\s*-?\s*sixth\b/, '36th')
+      nsub!(/\bthirty\s*-?\s*five\b/, '35')
+      nsub!(/\bthirty\s*-?\s*fifth\b/, '35th')
+      nsub!(/\bthirty\s*-?\s*four\b/, '34')
+      nsub!(/\bthirty\s*-?\s*fourth\b/, '34th')
+      nsub!(/\bthirty\s*-?\s*three\b/, '33')
+      nsub!(/\bthirty\s*-?\s*third\b/, '33rd')
+      nsub!(/\bthirty\s*-?\s*two\b/, '32')
+      nsub!(/\bthirty\s*-?\s*second\b/, '32nd')
+      nsub!(/\bthirty\s*-?\s*one\b/, '31')
+      nsub!(/\bthirty\s*-?\s*first\b/, '31st')
+      nsub!(/\bthirty\b/, '30')
+      nsub!(/\bthirtieth\b/, '30th')
+      nsub!(/\btwenty\s*-?\s*nine\b/, '29')
+      nsub!(/\btwenty\s*-?\s*ninth\b/, '29th')
+      nsub!(/\btwenty\s*-?\s*eight\b/, '28')
+      nsub!(/\btwenty\s*-?\s*eighth\b/, '28th')
+      nsub!(/\btwenty\s*-?\s*seven\b/, '27')
+      nsub!(/\btwenty\s*-?\s*seventh\b/, '27th')
+      nsub!(/\btwenty\s*-?\s*six\b/, '26')
+      nsub!(/\btwenty\s*-?\s*sixth\b/, '26th')
+      nsub!(/\btwenty\s*-?\s*five\b/, '25')
+      nsub!(/\btwenty\s*-?\s*fifth\b/, '25th')
+      nsub!(/\btwenty\s*-?\s*four\b/, '24')
+      nsub!(/\btwenty\s*-?\s*fourth\b/, '24th')
+      nsub!(/\btwenty\s*-?\s*three\b/, '23')
+      nsub!(/\btwenty\s*-?\s*third\b/, '23rd')
+      nsub!(/\btwenty\s*-?\s*two\b/, '22')
+      nsub!(/\btwenty\s*-?\s*second\b/, '22nd')
+      nsub!(/\btwenty\s*-?\s*one\b/, '21')
+      nsub!(/\btwenty\s*-?\s*first\b/, '21st')
+      nsub!(/\btwenty\b/, '20')
+      nsub!(/\btwentieth\b/, '20th')
+      nsub!(/\bnineteen\b/, '19')
+      nsub!(/\bnineteenth\b/, '19th')
+      nsub!(/\beighteen\b/, '18')
+      nsub!(/\beighteenth\b/, '18th')
+      nsub!(/\bseventeen\b/, '17')
+      nsub!(/\bseventeenth\b/, '17th')
+      nsub!(/\bsixteen\b/, '16')
+      nsub!(/\bsixteenth\b/, '16th')
+      nsub!(/\bfifteen\b/, '15')
+      nsub!(/\bfifteenth\b/, '15th')
+      nsub!(/\bfourteen\b/, '14')
+      nsub!(/\bfourteenth\b/, '14th')
+      nsub!(/\bthirteen/, '13')
+      nsub!(/\bthirteenth/, '13th')
+      nsub!(/\btwelve\b/, '12')
+      nsub!(/\btwelfth\b/, '12th')
+      nsub!(/\beleven\b/, '11')
+      nsub!(/\beleventh\b/, '11th')
+      nsub!(/\bten\b/, '10')
+      nsub!(/\btenth\b/, '10th')
+      nsub!(/\bnine\b/, '9')
+      nsub!(/\bninth\b/, '9th')
+      nsub!(/\beight\b/, '8')
+      nsub!(/\beighth\b/, '8th')
+      nsub!(/\bseven\b/, '7')
+      nsub!(/\bseventh\b/, '7th')
+      nsub!(/\bsix\b/, '6')
+      nsub!(/\bsixth\b/, '6th')
+      nsub!(/\bfive\b/, '5')
+      nsub!(/\bfifth\b/, '5th')
+      nsub!(/\bfour\b/, '4')
+      nsub!(/\bfourth\b/, '4th')
+      nsub!(/\bthree\b/, '3')
+      nsub!(/\bthird\b/, '3rd')
+      nsub!(/\btwo\b/, '2')
+      nsub!(/\bsecond\b/, '2nd')
+      nsub!(/\bone\b/, '1')
+      nsub!(/\bfirst\b/, '1st')
+      nsub!(/\bzero\b/, '0')
+      nsub!(/\bzeroth\b/, '0th')
     end
 
     def standardize_am_pm
-      nsub!(/([0-9])(?:\s*)a\b/,'\1am')  # allows 5a as 5am
-      nsub!(/([0-9])(?:\s*)p\b/,'\1pm')  # allows 5p as 5pm
-      nsub!(/\s+am\b/,'am')  # removes any spaces before am, shouldn't I check for preceeding digits?
-      nsub!(/\s+pm\b/,'pm')  # removes any spaces before pm, shouldn't I check for preceeding digits?
+      nsub!(/([0-9])(?:\s*)a\b/, '\1am')  # allows 5a as 5am
+      nsub!(/([0-9])(?:\s*)p\b/, '\1pm')  # allows 5p as 5pm
+      nsub!(/\s+am\b/, 'am')  # removes any spaces before am, shouldn't I check for preceeding digits?
+      nsub!(/\s+pm\b/, 'pm')  # removes any spaces before pm, shouldn't I check for preceeding digits?
     end
 
     def replace_hyphens
-      nsub!(/--?/,' through ')
+      nsub!(/--?/, ' through ')
     end
 
     def insert_repeats_before_words_indicating_recurrence_lame
       comps = query_str.split
-      (daily_index = comps.index("daily")) && comps[daily_index - 1] != "repeats" && comps[daily_index] = "repeats daily"
-      (weekly_index = comps.index("weekly")) && comps[weekly_index - 1] != "repeats" && comps[weekly_index] = "repeats weekly"
-      (monthly_index = comps.index("monthly")) && comps[monthly_index - 1] != "repeats" && comps[monthly_index] = "repeats monthly"
+      (daily_index = comps.index('daily')) && comps[daily_index - 1] != 'repeats' && comps[daily_index] = 'repeats daily'
+      (weekly_index = comps.index('weekly')) && comps[weekly_index - 1] != 'repeats' && comps[weekly_index] = 'repeats weekly'
+      (monthly_index = comps.index('monthly')) && comps[monthly_index - 1] != 'repeats' && comps[monthly_index] = 'repeats monthly'
       if (rejoin = comps.join(' ')) != query_str
-        nsub!(/.+/,rejoin)
+        nsub!(/.+/, rejoin)
       end
     end
 
     def insert_space_at_end_of_string_lame
   #      nsub!(/(.+)/,'\1 ')  # I don't really want to be notified about this
-      query_str.gsub!(/(.+)/,'\1 ')
+      query_str.gsub!(/(.+)/, '\1 ')
     end
 
     def to_s
@@ -410,63 +409,64 @@ module Nickel
     end
 
     private
+
     attr_accessor :query_str
 
     def standardize_input
-      nsub!(/last\s+#{DAY_OF_WEEK}/,'5th \1')     # last dayname  =>  5th dayname
+      nsub!(/last\s+#{DAY_OF_WEEK}/, '5th \1')     # last dayname  =>  5th dayname
       nsub!(/\ba\s+(week|month|day)/, '1 \1')     # a month|week|day  =>  1 month|week|day
-      nsub!(/^(through|until)/,'today through')   # ^through  =>  today through
-      nsub!(/every\s*(night|morning)/,'every day')
-      nsub!(/tonight/,'today')
-      nsub!(/this(?:\s*)morning/,'today')
-      nsub!(/before\s+12pm/,'6am to 12pm')        # arbitrary
+      nsub!(/^(through|until)/, 'today through')   # ^through  =>  today through
+      nsub!(/every\s*(night|morning)/, 'every day')
+      nsub!(/tonight/, 'today')
+      nsub!(/this(?:\s*)morning/, 'today')
+      nsub!(/before\s+12pm/, '6am to 12pm')        # arbitrary
 
       # Handle 'THE' Cases
       # Attempt to pick out where a user entered 'the' when they really mean 'every'.
       # For example,
       # The first of every month and the 22nd of THE month  =>  repeats monthly first xxxxxx repeats monthly 22nd xxxxxxx
-      nsub!(/(?:the\s+)?#{DATE_DD_WITH_SUFFIX}\s+(?:of\s+)?(?:every|each)\s+month((?:.*)of\s+the\s+month(?:.*))/) do |m1,m2|
-        ret_str = " repeats monthly " + m1
+      nsub!(/(?:the\s+)?#{DATE_DD_WITH_SUFFIX}\s+(?:of\s+)?(?:every|each)\s+month((?:.*)of\s+the\s+month(?:.*))/) do |m1, m2|
+        ret_str = ' repeats monthly ' + m1
         ret_str << m2.gsub(/(?:and\s+)?(?:the\s+)?#{DATE_DD_WITH_SUFFIX}\s+of\s+the\s+month/, ' repeats monthly \1 ')
       end
 
       # Every first sunday of the month and the last tuesday  =>  repeats monthly first sunday xxxxxxxxx repeats monthly last tuesday xxxxxxx
-      nsub!(/every\s+#{WEEK_OF_MONTH}\s+#{DAY_OF_WEEK}\s+of\s+(?:the\s+)?month((?:.*)and\s+(?:the\s+)?#{WEEK_OF_MONTH}\s+#{DAY_OF_WEEK}(?:.*))/) do |m1,m2,m3|
-        ret_str = " repeats monthly " + m1 + " " + m2 + " "
+      nsub!(/every\s+#{WEEK_OF_MONTH}\s+#{DAY_OF_WEEK}\s+of\s+(?:the\s+)?month((?:.*)and\s+(?:the\s+)?#{WEEK_OF_MONTH}\s+#{DAY_OF_WEEK}(?:.*))/) do |m1, m2, m3|
+        ret_str = ' repeats monthly ' + m1 + ' ' + m2 + ' '
         ret_str << m3.gsub(/and\s+(?:the\s+)?#{WEEK_OF_MONTH}\s+#{DAY_OF_WEEK}(?:\s*)(?:of\s+)?(?:the\s+)?(?:month\s+)?/, ' repeats monthly \1 \2 ')
       end
 
       # The x through the y of oct z  =>  10/x/z through 10/y/z
-      nsub!(/(?:the\s+)?#{DATE_DD}\s+(?:through|to|until)\s+(?:the\s+)?#{DATE_DD}\s(?:of\s+)#{MONTH_OF_YEAR}\s+(?:of\s+)?#{YEAR}/) do |m1,m2,m3,m4|
+      nsub!(/(?:the\s+)?#{DATE_DD}\s+(?:through|to|until)\s+(?:the\s+)?#{DATE_DD}\s(?:of\s+)#{MONTH_OF_YEAR}\s+(?:of\s+)?#{YEAR}/) do |m1, m2, m3, m4|
         (ZDate.months_of_year.index(m3) + 1).to_s + '/' + m1 + '/' + m4 + ' through ' +  (ZDate.months_of_year.index(m3) + 1).to_s + '/' + m2 + '/' + m4
       end
 
       # The x through the y of oct  =>  10/x through 10/y
-      nsub!(/(?:the\s+)?#{DATE_DD}\s+(?:through|to|until)\s+(?:the\s+)#{DATE_DD}\s(?:of\s+)?#{MONTH_OF_YEAR}/) do |m1,m2,m3|
+      nsub!(/(?:the\s+)?#{DATE_DD}\s+(?:through|to|until)\s+(?:the\s+)#{DATE_DD}\s(?:of\s+)?#{MONTH_OF_YEAR}/) do |m1, m2, m3|
         (ZDate.months_of_year.index(m3) + 1).to_s + '/' + m1 + ' through ' + (ZDate.months_of_year.index(m3) + 1).to_s + '/' + m2
       end
 
       # January 1 - February 15
-      nsub!(/#{MONTH_OF_YEAR}\s+#{DATE_DD_NB_ON_SUFFIX}\s+(?:through|to|until)\s+#{MONTH_OF_YEAR}\s#{DATE_DD_NB_ON_SUFFIX}/) do |m1,m2,m3,m4|
-        (ZDate.months_of_year.index(m1) + 1).to_s + '/' + m2.gsub(/(st|nd|rd|th)/, "") + ' through ' + (ZDate.months_of_year.index(m3) + 1).to_s + '/' + m4.gsub(/(st|nd|rd|th)/, "")
+      nsub!(/#{MONTH_OF_YEAR}\s+#{DATE_DD_NB_ON_SUFFIX}\s+(?:through|to|until)\s+#{MONTH_OF_YEAR}\s#{DATE_DD_NB_ON_SUFFIX}/) do |m1, m2, m3, m4|
+        (ZDate.months_of_year.index(m1) + 1).to_s + '/' + m2.gsub(/(st|nd|rd|th)/, '') + ' through ' + (ZDate.months_of_year.index(m3) + 1).to_s + '/' + m4.gsub(/(st|nd|rd|th)/, '')
       end
 
-      #Tuesday, january 1 - friday, february 15, 2013
-      nsub!(/(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}\s+(?:through|to|until)\s+(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}(?:[\s,]+)#{YEAR}/) do |m1,m2,m3,m4,m5,m6,m7|
+      # Tuesday, january 1 - friday, february 15, 2013
+      nsub!(/(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}\s+(?:through|to|until)\s+(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}(?:[\s,]+)#{YEAR}/) do |m1, m2, m3, m4, m5, m6, m7|
         if m7.nil?
-          (ZDate.months_of_year.index(m2) + 1).to_s + '/' + m3.gsub(/(st|nd|rd|th)/, "") + ' through ' + (ZDate.months_of_year.index(m5) + 1).to_s + '/' + m6
+          (ZDate.months_of_year.index(m2) + 1).to_s + '/' + m3.gsub(/(st|nd|rd|th)/, '') + ' through ' + (ZDate.months_of_year.index(m5) + 1).to_s + '/' + m6
         else
-          (ZDate.months_of_year.index(m2) + 1).to_s + '/' + m3.gsub(/(st|nd|rd|th)/, "") + '/' + m7 + ' through ' + (ZDate.months_of_year.index(m5) + 1).to_s + '/' + m6.gsub(/(st|nd|rd|th)/, "") + "/" + m7
+          (ZDate.months_of_year.index(m2) + 1).to_s + '/' + m3.gsub(/(st|nd|rd|th)/, '') + '/' + m7 + ' through ' + (ZDate.months_of_year.index(m5) + 1).to_s + '/' + m6.gsub(/(st|nd|rd|th)/, '') + '/' + m7
         end
       end
 
-      #Tuesday, january 1 2013 - friday, february 15, 2013
-      nsub!(/(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}\s+#{YEAR}\s+(?:through|to|until)\s+(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}(?:[\s,]+)#{YEAR}/) do |m1,m2,m3,m4,m5,m6,m7,m8|
-          (ZDate.months_of_year.index(m2) + 1).to_s + '/' + m3 + '/' + m4 + ' through ' + (ZDate.months_of_year.index(m6) + 1).to_s + '/' + m7 + "/" + m8
+      # Tuesday, january 1 2013 - friday, february 15, 2013
+      nsub!(/(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}\s+#{YEAR}\s+(?:through|to|until)\s+(?:#{DAY_OF_WEEK})?(?:[\s,]+)#{MONTH_OF_YEAR}(?:[\s,]+)#{DATE_DD}(?:[\s,]+)#{YEAR}/) do |m1, m2, m3, m4, m5, m6, m7, m8|
+        (ZDate.months_of_year.index(m2) + 1).to_s + '/' + m3 + '/' + m4 + ' through ' + (ZDate.months_of_year.index(m6) + 1).to_s + '/' + m7 + '/' + m8
       end
 
       # Monthname x through y
-      nsub!(/#{MONTH_OF_YEAR}\s+(?:the\s+)?#{DATE_DD_NB_ON_SUFFIX}\s+(?:of\s+)?(?:#{YEAR}\s+)?(?:through|to|until)\s+(?:the\s+)?#{DATE_DD_NB_ON_SUFFIX}(?:\s+of)?(?:\s+#{YEAR})?/) do |m1,m2,m3,m4,m5|
+      nsub!(/#{MONTH_OF_YEAR}\s+(?:the\s+)?#{DATE_DD_NB_ON_SUFFIX}\s+(?:of\s+)?(?:#{YEAR}\s+)?(?:through|to|until)\s+(?:the\s+)?#{DATE_DD_NB_ON_SUFFIX}(?:\s+of)?(?:\s+#{YEAR})?/) do |m1, m2, m3, m4, m5|
         if m3  # $3 holds first occurrence of year
           (ZDate.months_of_year.index(m1) + 1).to_s + '/' + m2 + '/' + m3 + ' through ' + (ZDate.months_of_year.index(m1) + 1).to_s + '/' + m4 + '/' + m3
         elsif m5 # $5 holds second occurrence of year
@@ -479,7 +479,7 @@ module Nickel
       # Monthname x through monthname y
       # Jan 14 through jan 18  =>  1/14 through 1/18
       # Oct 2 until oct 5
-      nsub!(/#{MONTH_OF_YEAR}\s+#{DATE_DD_NB_ON_SUFFIX}\s+(?:to|through|until)\s+#{MONTH_OF_YEAR}\s+#{DATE_DD_NB_ON_SUFFIX}\s+(?:of\s+)?(?:#{YEAR})?/) do |m1,m2,m3,m4,m5|
+      nsub!(/#{MONTH_OF_YEAR}\s+#{DATE_DD_NB_ON_SUFFIX}\s+(?:to|through|until)\s+#{MONTH_OF_YEAR}\s+#{DATE_DD_NB_ON_SUFFIX}\s+(?:of\s+)?(?:#{YEAR})?/) do |m1, m2, m3, m4, m5|
         if m5
           (ZDate.months_of_year.index(m1) + 1).to_s + '/' + m2 + '/' + m5 + ' through ' + (ZDate.months_of_year.index(m3) + 1).to_s + '/' + m4 + '/' + m5 + ' '
         else
@@ -488,12 +488,12 @@ module Nickel
       end
 
       # Mnday the 23rd, tuesday the 24th and wed the 25th of oct  =>  11/23 11/24 11/25
-      nsub!(/((?:#{DAY_OF_WEEK_NB}\s+the\s+#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?){1,31})of\s+#{MONTH_OF_YEAR}\s*(#{YEAR})?/) do |m1,m2,m3|
+      nsub!(/((?:#{DAY_OF_WEEK_NB}\s+the\s+#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?){1,31})of\s+#{MONTH_OF_YEAR}\s*(#{YEAR})?/) do |m1, m2, m3|
         month_str = (ZDate.months_of_year.index(m2) + 1).to_s
         if m3
-          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/,'').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1/' + m3)
+          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/, '').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1/' + m3)
         else
-          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/,'').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1')
+          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/, '').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1')
         end
       end
 
@@ -501,12 +501,12 @@ module Nickel
       # the 23rd, 24th, and 25th of october             =>  11/23 11/24 11/25
       # the 23rd, 24th, and 25th of october 2010        =>  11/23/2010 11/24/2010 11/25/2010
       # monday and tuesday, the 23rd and 24th of july   =>  7/23 7/24
-      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:day\s+)?(?:in\s+)?(?:of\s+)#{MONTH_OF_YEAR}\s*(#{YEAR})?/) do |m1,m2,m3|
+      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:day\s+)?(?:in\s+)?(?:of\s+)#{MONTH_OF_YEAR}\s*(#{YEAR})?/) do |m1, m2, m3|
         month_str = (ZDate.months_of_year.index(m2) + 1).to_s
         if m3
-          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/,'').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1/' + m3)
+          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/, '').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1/' + m3)
         else
-          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/,'').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1')
+          m1.gsub(/\b(and|the)\b|#{DAY_OF_WEEK}/, '').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1')
         end
       end
 
@@ -515,21 +515,21 @@ module Nickel
       # Dec 2nd, 3rd, and 5th 2008  => 12/2/2008 12/2/2008 12/5/2008
       # Mon nov 23rd 08
       # Dec 2, 3, 5, 2008  =>  12/2/2008 12/3/2008 12/5/2008
-      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+((?:(?:the\s+)?#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?){1,31})#{YEAR}/) do |m1,m2,m3|
+      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+((?:(?:the\s+)?#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?){1,31})#{YEAR}/) do |m1, m2, m3|
         month_str = (ZDate.months_of_year.index(m1) + 1).to_s
-        m2.gsub(/\b(and|the)\b/,'').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1/' + m3)
+        m2.gsub(/\b(and|the)\b/, '').gsub(/#{DATE_DD_NB_ON_SUFFIX}/, month_str + '/\1/' + m3)
       end
 
-      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+((?:(?:the\s+)?#{DATE_DD_WITHOUT_SUFFIX_NB}\s+(?:and\s+)?){1,31})#{YEAR}/) do |m1,m2,m3|
+      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+((?:(?:the\s+)?#{DATE_DD_WITHOUT_SUFFIX_NB}\s+(?:and\s+)?){1,31})#{YEAR}/) do |m1, m2, m3|
         month_str = (ZDate.months_of_year.index(m1) + 1).to_s
-        m2.gsub(/\b(and|the)\b/,'').gsub(/#{DATE_DD_WITHOUT_SUFFIX}/, month_str + '/\1/' + m3)
+        m2.gsub(/\b(and|the)\b/, '').gsub(/#{DATE_DD_WITHOUT_SUFFIX}/, month_str + '/\1/' + m3)
       end
 
       # Dec 2nd, 3rd, and 4th  =>  12/2, 12/3, 12/4
       # Note: dec 5 9 to 5 will give an error, need to find these and convert to dec 5 from 9 to 5; also dec 3,4, 9 to|through 5 --> dec 3, 4 from 9 through 5
-      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) do |m1,m2|
+      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) do |m1, m2|
         month_str = (ZDate.months_of_year.index(m1) + 1).to_s
-        m2.gsub(/(and|the)/,'').gsub(/#{DATE_DD_NB_ON_SUFFIX}/) {month_str + '/' + $1}  # that $1 is from the nested match!
+        m2.gsub(/(and|the)/, '').gsub(/#{DATE_DD_NB_ON_SUFFIX}/) { month_str + '/' + Regexp.last_match(1) }  # last match is from the nested match!
       end
 
       # Apr 29, 5 - 8pm
@@ -544,13 +544,13 @@ module Nickel
       # "dec 2, 3, and 4" --> 12/2, 12/3, 12/4
       # "mon, tue, wed, dec 2, 3, and 4" --> 12/2, 12/3, 12/4
       nsub!(/(#{MONTH_OF_YEAR_NB}\s+(?:the\s+)?(?:(?:#{DATE_DD_WITHOUT_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:to|through|until)\s+#{DATE_DD_WITHOUT_SUFFIX_NB})/) { |m1| m1.gsub(/#{DATE_DD_WITHOUT_SUFFIX}\s+(to|through|until)/, 'from \1 through ') }
-      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+(?:the\s+)?((?:#{DATE_DD_WITHOUT_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) do |m1,m2|
+      nsub!(/(?:(?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})?#{MONTH_OF_YEAR}\s+(?:the\s+)?((?:#{DATE_DD_WITHOUT_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) do |m1, m2|
         month_str = (ZDate.months_of_year.index(m1) + 1).to_s
-        m2.gsub(/(and|the)/,'').gsub(/#{DATE_DD_NB_ON_SUFFIX}/) {month_str + '/' + $1}  # $1 from nested match
+        m2.gsub(/(and|the)/, '').gsub(/#{DATE_DD_NB_ON_SUFFIX}/) { month_str + '/' + Regexp.last_match(1) }  # last match is from nested match
       end
 
       # "monday 12/6" --> 12/6
-      nsub!(/#{DAY_OF_WEEK_NB}\s+(#{DATE_MM_SLASH_DD})/,'\1')
+      nsub!(/#{DAY_OF_WEEK_NB}\s+(#{DATE_MM_SLASH_DD})/, '\1')
 
       # "next friday to|until|through the following tuesday" --> 10/12 through 10/16
       # "next friday through sunday" --> 10/12 through 10/14
@@ -558,9 +558,9 @@ module Nickel
       # we are not going to do date calculations here anymore, so instead:
       # next friday to|until|through the following tuesday" --> next friday through tuesday
       # next friday and the following sunday --> next friday and sunday
-      nsub!(/next\s+#{DAY_OF_WEEK}\s+(to|until|through|and)\s+(?:the\s+)?(?:following|next)?(?:\s*)#{DAY_OF_WEEK}/) do |m1,m2,m3|
+      nsub!(/next\s+#{DAY_OF_WEEK}\s+(to|until|through|and)\s+(?:the\s+)?(?:following|next)?(?:\s*)#{DAY_OF_WEEK}/) do |m1, m2, m3|
         connector = (m2 =~ /and/ ? ' ' : ' through ')
-        "next " + m1 + connector + m3
+        'next ' + m1 + connector + m3
       end
 
       # "this friday to|until|through the following tuesday" --> 10/5 through 10/9
@@ -569,63 +569,63 @@ module Nickel
       # No longer performing date calculation
       # this friday and the following monday --> fri mon
       # this friday through the following tuesday --> fri through tues
-      nsub!(/(?:this\s+)?#{DAY_OF_WEEK}\s+(to|until|through|and)\s+(?:the\s+)?(?:this|following)(?:\s*)#{DAY_OF_WEEK}/) do |m1,m2,m3|
+      nsub!(/(?:this\s+)?#{DAY_OF_WEEK}\s+(to|until|through|and)\s+(?:the\s+)?(?:this|following)(?:\s*)#{DAY_OF_WEEK}/) do |m1, m2, m3|
         connector = (m2 =~ /and/ ? ' ' : ' through ')
         m1 + connector + m3
       end
 
       # "the wed after next" --> 2 wed from today
-      nsub!(/(?:the\s+)?#{DAY_OF_WEEK}\s+(?:after|following)\s+(?:the\s+)?next/,'2 \1 from today')
+      nsub!(/(?:the\s+)?#{DAY_OF_WEEK}\s+(?:after|following)\s+(?:the\s+)?next/, '2 \1 from today')
 
       # "mon and tue" --> mon tue
-      nsub!(/(#{DAY_OF_WEEK}\s+and\s+#{DAY_OF_WEEK})(?:\s+and)?/,'\2 \3')
+      nsub!(/(#{DAY_OF_WEEK}\s+and\s+#{DAY_OF_WEEK})(?:\s+and)?/, '\2 \3')
 
       # "mon wed every week" --> every mon wed
-      nsub!(/((#{DAY_OF_WEEK}(?:\s*)){1,7})(?:of\s+)?(?:every|each)(\s+other)?\s+week/,'every \4 \1')
+      nsub!(/((#{DAY_OF_WEEK}(?:\s*)){1,7})(?:of\s+)?(?:every|each)(\s+other)?\s+week/, 'every \4 \1')
 
       # "every 2|3 weeks" --> every 2nd|3rd week
-      nsub!(/(?:repeats\s+)?every\s+(2|3)\s+weeks/) {|m1| "every " + m1.to_i.ordinalize + " week"}
+      nsub!(/(?:repeats\s+)?every\s+(2|3)\s+weeks/) { |m1| 'every ' + m1.to_i.ordinalize + ' week' }
 
       # "every week on mon tue fri" --> every mon tue fri
-      nsub!(/(?:repeats\s+)?every\s+(?:(other|3rd|2nd)\s+)?weeks?\s+(?:\bon\s+)?((?:#{DAY_OF_WEEK_NB}\s+){1,7})/,'every \1 \2')
+      nsub!(/(?:repeats\s+)?every\s+(?:(other|3rd|2nd)\s+)?weeks?\s+(?:\bon\s+)?((?:#{DAY_OF_WEEK_NB}\s+){1,7})/, 'every \1 \2')
 
       # "every mon and every tue and.... " --> every mon tue ...
-      nsub!(/every\s+#{DAY_OF_WEEK}\s+(?:and\s+)?every\s+#{DAY_OF_WEEK}(?:\s+(?:and\s+)?every\s+#{DAY_OF_WEEK})?(?:\s+(?:and\s+)?every\s+#{DAY_OF_WEEK})?(?:\s+(?:and\s+)?every\s+#{DAY_OF_WEEK})?/,'every \1 \2 \3 \4 \5')
+      nsub!(/every\s+#{DAY_OF_WEEK}\s+(?:and\s+)?every\s+#{DAY_OF_WEEK}(?:\s+(?:and\s+)?every\s+#{DAY_OF_WEEK})?(?:\s+(?:and\s+)?every\s+#{DAY_OF_WEEK})?(?:\s+(?:and\s+)?every\s+#{DAY_OF_WEEK})?/, 'every \1 \2 \3 \4 \5')
 
       # monday, wednesday, and friday next week at 8
       nsub!(/((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){1,7})(?:of\s+)?(this|next)\s+week/, '\2 \1')
 
       # "every day this|next week"  --> returns monday through friday of the closest week, kinda stupid
       # doesn't do that anymore, no date calculations allowed here, instead just formats it nicely for construct finders --> every day this|next week
-      nsub!(/every\s+day\s+(?:of\s+)?(this|the|next)\s+week\b./) {|m1| m1 == 'next' ? "every day next week" : "every day this week"}
+      nsub!(/every\s+day\s+(?:of\s+)?(this|the|next)\s+week\b./) { |m1| m1 == 'next' ? 'every day next week' : 'every day this week' }
 
       # "every day for the next week" --> "every day this week"
       nsub!(/every\s+day\s+for\s+(the\s+)?(next|this)\s+week/, 'every day this week')
 
       # "this weekend" --> sat sun
-      nsub!(/(every\s+day\s+|both\s+days\s+)?this\s+weekend(\s+on)?(\s+both\s+days|\s+every\s+day|\s+sat\s+sun)?/,'sat sun')
+      nsub!(/(every\s+day\s+|both\s+days\s+)?this\s+weekend(\s+on)?(\s+both\s+days|\s+every\s+day|\s+sat\s+sun)?/, 'sat sun')
 
       # "this weekend including mon" --> sat sun mon
-      nsub!(/sat\s+sun\s+(and|includ(es?|ing))\s+mon/,'sat sun mon')
-      nsub!(/sat\s+sun\s+(and|includ(es?|ing))\s+fri/,'fri sat sun')
+      nsub!(/sat\s+sun\s+(and|includ(es?|ing))\s+mon/, 'sat sun mon')
+      nsub!(/sat\s+sun\s+(and|includ(es?|ing))\s+fri/, 'fri sat sun')
 
       # Note: next weekend including monday will now fail.  Need to make constructors find "next sat sun mon"
       # "next weekend" --> next weekend
-      nsub!(/(every\s+day\s+|both\s+days\s+)?next\s+weekend(\s+on)?(\s+both\s+days|\s+every\s+day|\s+sat\s+sun)?/,'next weekend')
+      nsub!(/(every\s+day\s+|both\s+days\s+)?next\s+weekend(\s+on)?(\s+both\s+days|\s+every\s+day|\s+sat\s+sun)?/, 'next weekend')
 
       # "next weekend including mon" --> next sat sun mon
-      nsub!(/next\s+weekend\s+(and|includ(es?|ing))\s+mon/,'next sat sun mon')
-      nsub!(/next\s+weekend\s+(and|includ(es?|ing))\s+fri/,'next fri sat sun')
+      nsub!(/next\s+weekend\s+(and|includ(es?|ing))\s+mon/, 'next sat sun mon')
+      nsub!(/next\s+weekend\s+(and|includ(es?|ing))\s+fri/, 'next fri sat sun')
 
       # "every weekend" --> every sat sun
-      nsub!(/every\s+weekend(?:\s+(?:and|includ(?:es?|ing))\s+(mon|fri))?/,'every sat sun' + ' \1')  # regarding "every sat sun fri", order should not matter after "every" keyword
+      nsub!(/every\s+weekend(?:\s+(?:and|includ(?:es?|ing))\s+(mon|fri))?/, 'every sat sun' + ' \1')  # regarding "every sat sun fri", order should not matter after "every" keyword
 
       # "weekend" --> sat sun     !!! catch all
-      nsub!(/weekend/,'sat sun')
+      nsub!(/weekend/, 'sat sun')
 
       # "mon through wed" -- >  mon tue wed
       # CATCH ALL FOR SPANS, TRY NOT TO USE THIS
-      nsub!(/#{DAY_OF_WEEK}\s+(?:through|to|until)\s+#{DAY_OF_WEEK}/) do |m1,m2|
+      nsub!(/#{DAY_OF_WEEK}\s+(?:through|to|until)\s+#{DAY_OF_WEEK}/) do |m1, m2|
         index1 = ZDate.days_of_week.index(m1)
         index2 = ZDate.days_of_week.index(m2)
         i = index1
@@ -636,10 +636,11 @@ module Nickel
             i += 1
           end
         elsif index2 < index1
-          begin
+          loop do
             ret_string << ZDate.days_of_week[i] + ' '
             i = (i + 1) % 7
-          end while i != index2 + 1     # wrap until it hits index2
+            break if i != index2 + 1     # wrap until it hits index2
+          end
         else
           # indices are the same, one week event
           8.times do
@@ -651,132 +652,132 @@ module Nickel
       end
 
       # "every day" --> repeats daily
-      nsub!(/\b(repeat(?:s|ing)?|every|each)\s+da(ily|y)\b/,'repeats daily')
+      nsub!(/\b(repeat(?:s|ing)?|every|each)\s+da(ily|y)\b/, 'repeats daily')
 
       # "every other week starting this|next fri" --> every other friday starting this friday
-      nsub!(/every\s+(3rd|other)\s+week\s+(?:start(?:s|ing)?|begin(?:s|ning)?)\s+(this|next)\s+#{DAY_OF_WEEK}/,'every \1 \3 start \2 \3')
+      nsub!(/every\s+(3rd|other)\s+week\s+(?:start(?:s|ing)?|begin(?:s|ning)?)\s+(this|next)\s+#{DAY_OF_WEEK}/, 'every \1 \3 start \2 \3')
 
       # "every other|3rd friday starting this|next week" --> every other|3rd friday starting this|next friday
-      nsub!(/every\s+(3rd|other)\s+#{DAY_OF_WEEK}\s+(?:start(?:s|ing)?|begin(?:s|ning)?)\s+(this|next)\s+week/,'every \1 \2 start \3 \2')
+      nsub!(/every\s+(3rd|other)\s+#{DAY_OF_WEEK}\s+(?:start(?:s|ing)?|begin(?:s|ning)?)\s+(this|next)\s+week/, 'every \1 \2 start \3 \2')
 
       # "repeats monthly on the 1st and 2nd friday" --> repeats monthly 1st friday 2nd friday
       # "repeats every other month on the 1st and 2nd friday" --> repeats monthly 1st friday 2nd friday
       # "repeats every three months on the 1st and 2nd friday" --> repeats threemonthly 1st friday 2nd friday
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)          { |m1,m2| "repeats monthly " +  m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/) { |m1,m2| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)           { |m1,m2| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)          { |m1,m2| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/) { |m1,m2| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)           { |m1,m2| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)          { |m1, m2| 'repeats monthly ' +  m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/) { |m1, m2| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)           { |m1, m2| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)          { |m1, m2| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/) { |m1, m2| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+months?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}/)           { |m1, m2| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
 
       # "repeats monthly on the 1st friday" --> repeats monthly 1st friday
       # "repeats monthly on the 1st friday, second tuesday, and third friday" --> repeats monthly 1st friday 2nd tuesday 3rd friday
       # "repeats every other month on the 1st friday, second tuesday, and third friday" --> repeats monthly 1st friday 2nd tuesday 3rd friday
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)                 { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)           { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)                 { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)           { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)                 { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)           { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)                 { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/) { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})/)           { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "repeats monthly on the 1st friday saturday" --> repeats monthly 1st friday 1st saturday
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)                  { |m1,m2| "repeats monthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)  { |m1,m2| "repeats altmonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)            { |m1,m2| "repeats threemonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)                  { |m1,m2| "repeats monthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)  { |m1,m2| "repeats altmonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)            { |m1,m2| "repeats threemonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)                  { |m1, m2| 'repeats monthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)  { |m1, m2| 'repeats altmonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)            { |m1, m2| 'repeats threemonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)                  { |m1, m2| 'repeats monthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)  { |m1, m2| 'repeats altmonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+month(?:ly|s)?\s+(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})/)            { |m1, m2| 'repeats threemonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
 
       # "21st of each month" --> repeats monthly 21st
       # "on the 21st, 22nd and 25th of each month" --> repeats monthly 21st 22nd 25th
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:days?\s+)?(?:of\s+)?(?:each|all|every)\s+\bmonths?/)                  { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:days?\s+)?(?:of\s+)?(?:each|all|every)\s+(?:other|2n?d?)\s+months?/)  { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:days?\s+)?(?:of\s+)?(?:each|all|every)\s+3r?d?\s+months?/)            { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:days?\s+)?(?:of\s+)?(?:each|all|every)\s+\bmonths?/)                  { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:days?\s+)?(?:of\s+)?(?:each|all|every)\s+(?:other|2n?d?)\s+months?/)  { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,31})(?:days?\s+)?(?:of\s+)?(?:each|all|every)\s+3r?d?\s+months?/)            { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "repeats each month on the 22nd" --> repeats monthly 22nd
       # "repeats monthly on the 22nd 23rd and 24th" --> repeats monthly 22nd 23rd 24th
       # This can ONLY handle multi-day recurrence WITHOUT independent times for each, i.e. "repeats monthly on the 22nd at noon and 24th from 1 to 9"  won't work; that's going to be a tricky one.
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " " }
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-     #nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?\bmonth(?:s|ly)\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?\bmonthly\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " " }
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-     #nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:s|ly)\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " " }
-      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-     #nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?3r?d?\s+month(?:s|ly)\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)\bmonth(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?\bmonth(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+     # nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?\bmonth(?:s|ly)\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?\bmonthly\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)(?:other|2n?d?)\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+     # nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?(?:other|2n?d?)\s+month(?:s|ly)\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)3r?d?\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)(?:(?:each|every|all)\s+)?3r?d?\s+month(?:s|ly)?\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+     # nsub!(/(?:repeats\s+)?(?:(?:each|every|all)\s+)?3r?d?\s+month(?:s|ly)\s+(?:on\s+)?(?:the\s+)?((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/)  { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
 
       # "on day 4 of every month" --> repeats monthly 4
       # "on days 4 9 and 14 of every month" --> repeats monthly 4 9 14
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:day|date)s?\s+((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)(every|all|each)\s+\bmonths?/) { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " " }
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:day|date)s?\s+((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)(every|all|each)\s+(?:other|2n?d?)\s+months?/) { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " " }
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:day|date)s?\s+((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)(every|all|each)\s+3r?d?\s+months?/) { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " " }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:day|date)s?\s+((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)(every|all|each)\s+\bmonths?/) { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:day|date)s?\s+((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)(every|all|each)\s+(?:other|2n?d?)\s+months?/) { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:day|date)s?\s+((?:#{DATE_DD_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)(every|all|each)\s+3r?d?\s+months?/) { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "every 22nd of the month" --> repeats monthly 22
       # "every 22nd 23rd and 25th of the month" --> repeats monthly 22 23 25
-      nsub!(/(?:repeats\s+)?(?:every|each)\s+((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:day\s+)?(?:of\s+)?(?:the\s+)?\bmonth/) { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:every|each)\s+other\s+((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:day\s+)?(?:of\s+)?(?:the\s+)?\bmonth/) { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)?(?:every|each)\s+((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:day\s+)?(?:of\s+)?(?:the\s+)?\bmonth/) { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:every|each)\s+other\s+((?:#{DATE_DD_WITH_SUFFIX_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:day\s+)?(?:of\s+)?(?:the\s+)?\bmonth/) { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "every 1st and 2nd fri of the month" --> repeats monthly 1st fri 2nd fri
-      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/) { |m1,m2| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+other\s+((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/) { |m1,m2| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
+      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/) { |m1, m2| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+other\s+((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/) { |m1, m2| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
 
       # "every 1st friday of the month" --> repeats monthly 1st friday
       # "every 1st friday and 2nd tuesday of the month" --> repeats monthly 1st friday 2nd tuesday
-      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)  { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+other\s+((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)  { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)  { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+other\s+((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)  { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "every 1st fri sat of the month" --> repeats monthly 1st fri 1st sat
-      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)          { |m1,m2| "repeats monthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+other\s+(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)  { |m1,m2| "repeats altmonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
+      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)          { |m1, m2| 'repeats monthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:each|every|all)\s+other\s+(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:the\s+)?(?:(?:each|every|all)\s+)?\bmonths?/)  { |m1, m2| 'repeats altmonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
 
       # "the 1st and 2nd friday of every month" --> repeats monthly 1st friday 2nd friday
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all)\s+)\bmonths?/)                 { |m1,m2| "repeats monthly " +  m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all)\s+)(?:other|2n?d?)\s+months?/) { |m1,m2| "repeats altmonthly " +  m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all)\s+)3r?d?\s+months?/)           { |m1,m2| "repeats threemonthly " +  m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all)\s+)\bmonths?/)                 { |m1, m2| 'repeats monthly ' +  m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all)\s+)(?:other|2n?d?)\s+months?/) { |m1, m2| 'repeats altmonthly ' +  m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all)\s+)3r?d?\s+months?/)           { |m1, m2| 'repeats threemonthly ' +  m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
 
       # "the 1st friday of every month" --> repeats monthly 1st friday
       # "the 1st friday and the 2nd tuesday of every month" --> repeats monthly 1st friday 2nd tuesday
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all)\s+)\bmonths?/)                   { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all)\s+)(?:other|2n?d?)\s+months?/)   { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all)\s+)3r?d?\s+months?/)             { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all)\s+)\bmonths?/)                   { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all)\s+)(?:other|2n?d?)\s+months?/)   { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all)\s+)3r?d?\s+months?/)             { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "the 1st friday saturday of every month" --> repeats monthly 1st friday 1st saturday
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all)\s+)\bmonths?/)                  { |m1,m2| "repeats monthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all)\s+)(?:other|2n?d?)\s+months?/)  { |m1,m2| "repeats altmonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all)\s+)3r?d?\s+months?/)            { |m1,m2| "repeats threemonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all)\s+)\bmonths?/)                  { |m1, m2| 'repeats monthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all)\s+)(?:other|2n?d?)\s+months?/)  { |m1, m2| 'repeats altmonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)?(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all)\s+)3r?d?\s+months?/)            { |m1, m2| 'repeats threemonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
 
       # "repeats on the 1st and second friday of the month" --> repeats monthly 1st friday 2nd friday
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all|the)\s+)?\bmonths?/)                 { |m1,m2| "repeats monthly " +  m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all|the)\s+)?(?:other|2n?d?)\s+months?/) { |m1,m2| "repeats altmonthly " +  m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all|the)\s+)?3r?d?\s+months?/)           { |m1,m2| "repeats threemonthly " +  m1.gsub(/\b(and|the)\b/,'').split.join(" " + m2 + " ") + " " + m2 + " " }
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all|the)\s+)?\bmonths?/)                 { |m1, m2| 'repeats monthly ' +  m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all|the)\s+)?(?:other|2n?d?)\s+months?/) { |m1, m2| 'repeats altmonthly ' +  m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,5})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:(?:every|each|all|the)\s+)?3r?d?\s+months?/)           { |m1, m2| 'repeats threemonthly ' +  m1.gsub(/\b(and|the)\b/, '').split.join(' ' + m2 + ' ') + ' ' + m2 + ' ' }
 
       # "repeats on the 1st friday of the month --> repeats monthly 1st friday
       # "repeats on the 1st friday and second tuesday of the month" --> repeats monthly 1st friday 2nd tuesday
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all|the)\s+)?\bmonths?/)                   { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all|the)\s+)?(?:other|2n?d?)\s+months?/)   { |m1| "repeats altmonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all|the)\s+)?3r?d?\s+months?/)             { |m1| "repeats threemonthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all|the)\s+)?\bmonths?/)                   { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all|the)\s+)?(?:other|2n?d?)\s+months?/)   { |m1| 'repeats altmonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:(?:every|each|all|the)\s+)?3r?d?\s+months?/)             { |m1| 'repeats threemonthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "repeats on the 1st friday saturday of the month" --> repeats monthly 1st friday 1st saturday
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all|the)\s+)?\bmonths?/)                  { |m1,m2| "repeats monthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all|the)\s+)?(?:other|2n?d?)\s+months?/)  { |m1,m2| "repeats altmonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
-      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all|the)\s+)?3r?d?\s+months?/)            { |m1,m2| "repeats threemonthly " + m1 + " " + m2.split.join(" " + m1 + " ") + " "}
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all|the)\s+)?\bmonths?/)                  { |m1, m2| 'repeats monthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all|the)\s+)?(?:other|2n?d?)\s+months?/)  { |m1, m2| 'repeats altmonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
+      nsub!(/(?:repeats\s+)(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+){2,7})(?:of\s+)?(?:(?:every|each|all|the)\s+)?3r?d?\s+months?/)            { |m1, m2| 'repeats threemonthly ' + m1 + ' ' + m2.split.join(' ' + m1 + ' ') + ' ' }
 
       # "repeats each month" --> every month
-      nsub!(/(repeats\s+)?(each|every)\s+\bmonth(ly)?/,'every month ')
-      nsub!(/all\s+months/,'every month')
+      nsub!(/(repeats\s+)?(each|every)\s+\bmonth(ly)?/, 'every month ')
+      nsub!(/all\s+months/, 'every month')
 
       # "repeats every other month" --> every other month
-      nsub!(/(repeats\s+)?(each|every)\s+(other|2n?d?)\s+month(ly)?/,'every other month ')
-      nsub!(/(repeats\s+)?bimonthly/,'every other month ')    # hyphens have already been replaced in spell check (bi-monthly)
+      nsub!(/(repeats\s+)?(each|every)\s+(other|2n?d?)\s+month(ly)?/, 'every other month ')
+      nsub!(/(repeats\s+)?bimonthly/, 'every other month ')    # hyphens have already been replaced in spell check (bi-monthly)
 
       # "repeats every three months" --> every third month
-      nsub!(/(repeats\s+)?(each|every)\s+3r?d?\s+month/,'every third month ')
-      nsub!(/(repeats\s+)?trimonthly/,'every third month ')
+      nsub!(/(repeats\s+)?(each|every)\s+3r?d?\s+month/, 'every third month ')
+      nsub!(/(repeats\s+)?trimonthly/, 'every third month ')
 
       # All months
-      nsub!(/(repeats\s+)?all\s+months/,'every month ')
+      nsub!(/(repeats\s+)?all\s+months/, 'every month ')
       nsub!(/(repeats\s+)?all\s+other\+months/, 'every other month ')
 
       # All month
@@ -785,16 +786,16 @@ module Nickel
 
       # "repeats 2nd mon" --> repeats monthly 2nd mon
       # "repeats 2nd mon, 3rd fri, and the last sunday" --> repeats monthly 2nd mon 3rd fri 5th sun
-      nsub!(/repeats\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/) { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') + " "}
+      nsub!(/repeats\s+(?:\bon\s+)?(?:the\s+)?((?:(?:1|2|3|4|5)(?:st|nd|rd|th)?\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})/) { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') + ' ' }
 
       # "starting at x, ending at y" --> from x to y
-      nsub!(/(?:begin|start)(?:s|ing|ning)?\s+(?:at\s+)?#{TIME}\s+(?:and\s+)?end(?:s|ing)?\s+(?:at\s+)#{TIME}/,'from \1 to \2')
+      nsub!(/(?:begin|start)(?:s|ing|ning)?\s+(?:at\s+)?#{TIME}\s+(?:and\s+)?end(?:s|ing)?\s+(?:at\s+)#{TIME}/, 'from \1 to \2')
 
       # "the x through the y"
-      nsub!(/^(?:the\s+)?#{DATE_DD_WITH_SUFFIX}\s+(?:through|to|until)\s+(?:the\s+)?#{DATE_DD_WITH_SUFFIX}$/,'\1 through \2 ')
+      nsub!(/^(?:the\s+)?#{DATE_DD_WITH_SUFFIX}\s+(?:through|to|until)\s+(?:the\s+)?#{DATE_DD_WITH_SUFFIX}$/, '\1 through \2 ')
 
       # "x week(s) away" --> x week(s) from now
-      nsub!(/([0-9]+)\s+(day|week|month)s?\s+away/,'\1 \2s from now')
+      nsub!(/([0-9]+)\s+(day|week|month)s?\s+away/, '\1 \2s from now')
 
       # "x days from now" --> "x days from now"
       # "in 2 weeks|days|months" --> 2 days|weeks|months from now"
@@ -813,22 +814,22 @@ module Nickel
       nsub!(/^(?:\s*)(?:right\s+)?now(?:\s*)$/, '0 minutes from now')
 
       # "a week/month from yesterday|tomorrow" --> 1 week from yesterday|tomorrow
-      nsub!(/(?:(?:a|1)\s+)?(week|month)\s+from\s+(yesterday|tomorrow)/,'1 \1 from \2')
+      nsub!(/(?:(?:a|1)\s+)?(week|month)\s+from\s+(yesterday|tomorrow)/, '1 \1 from \2')
 
       # "a week/month from yesterday|tomorrow" --> 1 week from monday
-      nsub!(/(?:(?:a|1)\s+)?(week|month)\s+from\s+#{DAY_OF_WEEK}/,'1 \1 from \2')
+      nsub!(/(?:(?:a|1)\s+)?(week|month)\s+from\s+#{DAY_OF_WEEK}/, '1 \1 from \2')
 
       # "every 2|3 days" --> every 2nd|3rd day
-      nsub!(/every\s+(2|3)\s+days?/) {|m1| "every " + m1.to_i.ordinalize + " day"}
+      nsub!(/every\s+(2|3)\s+days?/) { |m1| 'every ' + m1.to_i.ordinalize + ' day' }
 
       # "the following" --> following
-      nsub!(/the\s+following/,'following')
+      nsub!(/the\s+following/, 'following')
 
       # "friday the 12th to sunday the 14th" --> 12th through 14th
-      nsub!(/#{DAY_OF_WEEK}\s+the\s+#{DATE_DD_WITH_SUFFIX}\s+(?:to|through|until)\s+#{DAY_OF_WEEK}\s+the\s+#{DATE_DD_WITH_SUFFIX}/,'\2 through \4')
+      nsub!(/#{DAY_OF_WEEK}\s+the\s+#{DATE_DD_WITH_SUFFIX}\s+(?:to|through|until)\s+#{DAY_OF_WEEK}\s+the\s+#{DATE_DD_WITH_SUFFIX}/, '\2 through \4')
 
       # "between 1 and 4" --> from 1 to 4
-      nsub!(/between\s+#{TIME}\s+and\s+#{TIME}/,'from \1 to \2')
+      nsub!(/between\s+#{TIME}\s+and\s+#{TIME}/, 'from \1 to \2')
 
       # "on the 3rd sat of this month" --> "3rd sat this month"
       # "on the 3rd sat and 5th tuesday of this month" --> "3rd sat this month 5th tuesday this month"
@@ -836,45 +837,45 @@ module Nickel
       # "on the 2nd and 3rd sat of this month" --> "2nd sat this month 3rd sat this month"
       # This is going to be dicey, I'm going to remove 'the' from the following regexprsns:
       # The 'the' case will be handled AFTER wrapper substitution at end of this method
-      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:this|of)\s+month/)               { |m1,m2| m2.gsub(/\band\b/,'').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 this month') }
-      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:this|of)\s+month/)     { |m1,m2| m1.gsub(/\b(and|the)\b/,'').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' this month') }
-      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:this|of)\s+month/) { |m1| m1.gsub(/\b(and|the)\b/,'').gsub(/#{DAY_OF_WEEK}/,'\1 this month') }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:this|of)\s+month/)               { |m1, m2| m2.gsub(/\band\b/, '').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 this month') }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:this|of)\s+month/)     { |m1, m2| m1.gsub(/\b(and|the)\b/, '').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' this month') }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:this|of)\s+month/) { |m1| m1.gsub(/\b(and|the)\b/, '').gsub(/#{DAY_OF_WEEK}/, '\1 this month') }
 
       # "on the 3rd sat of next month" --> "3rd sat next month"
       # "on the 3rd sat and 5th tuesday of next month" --> "3rd sat next month 5th tuesday next month"
       # "on the 3rd sat and sunday of next month" --> "3rd sat this month 3rd sun next month"
       # "on the 2nd and 3rd sat of next month" --> "2nd sat this month 3rd sat next month"
-      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?next\s+month/)                { |m1,m2| m2.gsub(/\band\b/,'').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 next month') }
-      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?next\s+month/)      { |m1,m2| m1.gsub(/\b(and|the)\b/,'').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' next month') }
-      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?next\s+month/)  { |m1| m1.gsub(/\b(and|the)\b/,'').gsub(/#{DAY_OF_WEEK}/,'\1 next month') }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?next\s+month/)                { |m1, m2| m2.gsub(/\band\b/, '').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 next month') }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?next\s+month/)      { |m1, m2| m1.gsub(/\b(and|the)\b/, '').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' next month') }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?next\s+month/)  { |m1| m1.gsub(/\b(and|the)\b/, '').gsub(/#{DAY_OF_WEEK}/, '\1 next month') }
 
       # "on the 3rd sat of nov" --> "3rd sat nov"
       # "on the 3rd sat and 5th tuesday of nov" --> "3rd sat nov 5th tuesday nov            !!!!!!! walking a fine line here, 'nov 5th', but then again the entire nlp walks a pretty fine line
       # "on the 3rd sat and sunday of nov" --> "3rd sat nov 3rd sun nov"
       # "on the 2nd and 3rd sat of nov" --> "2nd sat nov 3rd sat nov"
-      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/)                { |m1,m2,m3| m2.gsub(/\band\b/,'').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 ' + m3) }
-      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/)      { |m1,m2,m3| m1.gsub(/\b(and|the)\b/,'').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' ' + m3) }
-      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/)  { |m1,m2| m1.gsub(/\b(and|the)\b/,'').gsub(/#{DAY_OF_WEEK}/,'\1 ' + m2) }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/)                { |m1, m2, m3| m2.gsub(/\band\b/, '').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 ' + m3) }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/)      { |m1, m2, m3| m1.gsub(/\b(and|the)\b/, '').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' ' + m3) }
+      nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/)  { |m1, m2| m1.gsub(/\b(and|the)\b/, '').gsub(/#{DAY_OF_WEEK}/, '\1 ' + m2) }
 
       # "on the last day of nov" --> "last day nov"
-      nsub!(/(?:\bon\s+)?(?:the\s+)?last\s+day\s+(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/,'last day \1')
+      nsub!(/(?:\bon\s+)?(?:the\s+)?last\s+day\s+(?:of\s+)?(?:in\s+)?#{MONTH_OF_YEAR}/, 'last day \1')
       # "on the 1st|last day of this|the month" --> "1st|last day this month"
-      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|last)\s+day\s+(?:of\s+)?(?:this|the)?(?:\s*)month/,'\1 day this month')
+      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|last)\s+day\s+(?:of\s+)?(?:this|the)?(?:\s*)month/, '\1 day this month')
       # "on the 1st|last day of next month" --> "1st|last day next month"
-      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|last)\s+day\s+(?:of\s+)?next\s+month/,'\1 day next month')
+      nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|last)\s+day\s+(?:of\s+)?next\s+month/, '\1 day next month')
 
       # "every other weekend" --> every other sat sun
-      nsub!(/every\s+other\s+weekend/,'every other sat sun')
+      nsub!(/every\s+other\s+weekend/, 'every other sat sun')
 
       # "this week on mon "--> this mon
-      nsub!(/this\s+week\s+(?:on\s+)?#{DAY_OF_WEEK}/,'this \1')
+      nsub!(/this\s+week\s+(?:on\s+)?#{DAY_OF_WEEK}/, 'this \1')
       # "mon of this week " --> this mon
-      nsub!(/#{DAY_OF_WEEK}\s+(?:of\s+)?this\s+week/,'this \1')
+      nsub!(/#{DAY_OF_WEEK}\s+(?:of\s+)?this\s+week/, 'this \1')
 
       # "next week on mon "--> next mon
-      nsub!(/next\s+week\s+(?:on\s+)?#{DAY_OF_WEEK}/,'next \1')
+      nsub!(/next\s+week\s+(?:on\s+)?#{DAY_OF_WEEK}/, 'next \1')
       # "mon of next week " --> next mon
-      nsub!(/#{DAY_OF_WEEK}\s+(?:of\s+)?next\s+week/,'next \1')
+      nsub!(/#{DAY_OF_WEEK}\s+(?:of\s+)?next\s+week/, 'next \1')
 
       # Ordinal this month:
       # this will slip by now
@@ -897,7 +898,7 @@ module Nickel
       nsub!(/(?:next|the\s+following)\s+month\s+(?:(?:on|the)\s+)?(?:(?:on|the)\s+)?#{DATE_DD}/, '\1 next month')
 
       # "for the next 3 days|weeks|months" --> for 3 days|weeks|months
-      nsub!(/for\s+(?:the\s+)?(?:next|following)\s+(\d+)\s+(days|weeks|months)/,'for \1 \2')
+      nsub!(/for\s+(?:the\s+)?(?:next|following)\s+(\d+)\s+(days|weeks|months)/, 'for \1 \2')
 
       # This monthname -> monthname
       nsub!(/this\s+#{MONTH_OF_YEAR}/, '\1')
@@ -915,41 +916,40 @@ module Nickel
 
       # clean up wrapper terminology
       # This should always be at end of pre-process
-      nsub!(/(begin(s|ning)?|start(s|ing)?)(\s+(at|on))?/,'start')
-      nsub!(/(\bend(s|ing)?|through|until)(\s+(at|on))?/,'through')
-      nsub!(/start\s+(?:(?:this|in)\s+)?#{MONTH_OF_YEAR}/,'start \1')
+      nsub!(/(begin(s|ning)?|start(s|ing)?)(\s+(at|on))?/, 'start')
+      nsub!(/(\bend(s|ing)?|through|until)(\s+(at|on))?/, 'through')
+      nsub!(/start\s+(?:(?:this|in)\s+)?#{MONTH_OF_YEAR}/, 'start \1')
 
       # 'the' cases; what this is all about is if someone enters "first sunday of the month" they mean one date.  But if someone enters "first sunday of the month until december 2nd" they mean recurring
       # Do these actually do ANYTHING anymore?
       # "on the 3rd sat and sunday of the month" --> "repeats monthly 3rd sat 3rd sun"  OR  "3rd sat this month 3rd sun this month"
       if query_str =~ /(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:the)\s+month/
         if query_str =~ /(start|through)\s+#{DATE_MM_SLASH_DD}/
-          nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:the)\s+month/) {|m1,m2| "repeats monthly " + m2.gsub(/\band\b/,'').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1') }
+          nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:the)\s+month/) { |m1, m2| 'repeats monthly ' + m2.gsub(/\band\b/, '').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1') }
         else
-          nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:the)\s+month/) {|m1,m2| m2.gsub(/\band\b/,'').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 this month') }
+          nsub!(/(?:\bon\s+)?(?:the\s+)?(1st|2nd|3rd|4th|5th)\s+((?:#{DAY_OF_WEEK_NB}\s+(?:and\s+)?){2,7})(?:of\s+)?(?:the)\s+month/) { |m1, m2| m2.gsub(/\band\b/, '').gsub(/#{DAY_OF_WEEK}/, m1 + ' \1 this month') }
         end
       end
 
       # "on the 2nd and 3rd sat of this month" --> "repeats monthly 2nd sat 3rd sat"  OR  "2nd sat this month 3rd sat this month"
       if query_str =~ /(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the)\s+month/
         if query_str =~ /(start|through)\s+#{DATE_MM_SLASH_DD}/
-          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the)\s+month/) {|m1,m2| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2) }
+          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the)\s+month/) { |m1, m2| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2) }
         else
-          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the)\s+month/) {|m1,m2| m1.gsub(/\b(and|the)\b/,'').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' this month') }
+          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+(?:and\s+)?(?:the\s+)?){2,7})#{DAY_OF_WEEK}\s+(?:of\s+)?(?:the)\s+month/) { |m1, m2| m1.gsub(/\b(and|the)\b/, '').gsub(/(1st|2nd|3rd|4th|5th)/, '\1 ' + m2 + ' this month') }
         end
       end
 
       # "on the 3rd sat and 5th tuesday of this month" --> "repeats monthly 3rd sat 5th tue" OR "3rd sat this month 5th tuesday this month"
       if query_str =~ /(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the)\s+month/
         if query_str =~ /(start|through)\s+#{DATE_MM_SLASH_DD}/
-          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the)\s+month/) { |m1| "repeats monthly " + m1.gsub(/\b(and|the)\b/,'') }
+          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the)\s+month/) { |m1| 'repeats monthly ' + m1.gsub(/\b(and|the)\b/, '') }
         else
-          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the)\s+month/) { |m1| m1.gsub(/\b(and|the)\b/,'').gsub(/#{DAY_OF_WEEK}/,'\1 this month') }
+          nsub!(/(?:\bon\s+)?(?:the\s+)?((?:(?:1st|2nd|3rd|4th|5th)\s+#{DAY_OF_WEEK_NB}\s+(?:and\s+)?(?:the\s+)?){1,10})(?:of\s+)?(?:the)\s+month/) { |m1| m1.gsub(/\b(and|the)\b/, '').gsub(/#{DAY_OF_WEEK}/, '\1 this month') }
         end
       end
 
-      nsub!(/from\s+now\s+(through|to|until)/,'now through')
+      nsub!(/from\s+now\s+(through|to|until)/, 'now through')
     end
   end
 end
-