                     day = $.inArray value, self.days
                     length = weeks.length
                     weekPattern = if weekInfo.weekNum % 2 is 0 then 'even' else 'odd'
-                    eventWeeks = if self.view is 'month' then calendarInner.find('tbody').find "tr.#{weekPattern}-week" else calendarInner.find "tbody.#{weekPattern}-week"
+                    eventWeeks = calendarInner.find ".#{weekPattern}-week"
 
                     $.each eventWeeks, (key, value) ->
                         that = $ value
-                        weekLength = that.find("td:not(.#{self.classes.muted})").length
-                        eventDates.push that.find("td.drm-date[data-day=#{day}]").data('date')
+                        weekLength = that.find(".drm-date").length
+                        eventDates.push that.find(".#{self.classes.date}[data-day=#{day}]").data('date')
 
         addWeeklyEvents: (events, eventDates) =>
             self = @
             calendarInner = self.calendar.find "div.#{@calendarInnerClass}"
             currentMonth = calendarInner.data 'month'
             currentYear = calendarInner.data 'year'
-            firstDay = self.getDayOfWeek currentMonth, currentYear, 1
-            numberDays = self.getDaysInMonth (currentMonth + 1), currentYear
+            firstDay = self.getDayOfWeek currentMonth, 1, currentYear
+            numberDays = self.getDaysInMonth currentMonth, currentYear
             dayShift = if firstDay is self.daysPerWeek then 0 else firstDay
-            weeks = if self.view is 'month' then calendarInner.find('tbody').find 'tr.drm-week' else calendarInner.find 'tbody.drm-week'
+            weeks = calendarInner.find '.drm-week'
 
             # weekly events
             if events.day

            self.addEventForm = self.calendar.find('form.drm-calendar-new-event').hide()
            self.showEventFormButton = self.calendar.find 'button.drm-show-event-form'
            self.calendarViewActiveButton = self.calendar.find(".drm-calendar-view-nav button[data-view=#{self.view}]").addClass 'active'
            self.eventClass = 'events'
            self.classes =
                weekend: 'drm-cal-weekend'
                muted: 'drm-cal-muted'
                holiday: 'drm-cal-holiday'
                today: 'drm-cal-today'

            self.months = [             
                'January'

                    eventWeekNum = self.getEventWeekNum events.dayNum, day, numberDays, dayShift

                    if currentMonth is month
                        weeks.each ->
                            that = $ @
                            firstDay = that.find(".#{self.classes.date}").first().data 'date'
                            weekInfo = self.getDatesInWeek currentMonth, firstDay, currentYear
                            if eventWeekNum is weekInfo.weekNum
                                eventDates.push that.find(".#{self.classes.date}[data-day=#{day}]").data 'date'
            else
                eventDates.push parseInt(events.eventDate, 10)
                
