diff --git a/inkycal/modules/ical_parser.py b/inkycal/modules/ical_parser.py
index 5fab105..67269db 100644
--- a/inkycal/modules/ical_parser.py
+++ b/inkycal/modules/ical_parser.py
@@ -34,7 +34,7 @@ except ModuleNotFoundError:
 
 filename = os.path.basename(__file__).split('.py')[0]
 logger = logging.getLogger(filename)
-logger.setLevel(level=logging.INFO)
+logger.setLevel(level=logging.ERROR)
 
 class iCalendar:
   """iCalendar parsing moudule for inkycal.
diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py
index ffea504..cdded87 100644
--- a/inkycal/modules/inkycal_agenda.py
+++ b/inkycal/modules/inkycal_agenda.py
@@ -32,8 +32,8 @@ class Agenda(inkycal_module):
       if not param in section_config:
         raise Exception('config is missing {}'.format(param))
 
-    # module name
-    self.name = filename
+    # class name
+    self.name = self.__class__.__name__
 
     # module specific parameters
     self.date_format = 'ddd D MMM'
diff --git a/inkycal/modules/inkycal_calendar.py b/inkycal/modules/inkycal_calendar.py
index c9e1269..f2831f1 100644
--- a/inkycal/modules/inkycal_calendar.py
+++ b/inkycal/modules/inkycal_calendar.py
@@ -31,18 +31,16 @@ class Calendar(inkycal_module):
         raise Exception('config is missing {}'.format(param))
 
     # module name
-    self.name = filename
+    self.name = self.__class__.__name__
 
     # module specific parameters
-    self.shuffle_feeds = True
-
     self.num_font = ImageFont.truetype(
       fonts['NotoSans-SemiCondensed'], size = self.fontsize)
     self.weekstart = self.config['week_starts_on']
     self.show_events = True
-    self.date_format = 'D MMM' # used for dates
-    self.time_format = "HH:mm" # used for timings
-    self.language = 'en' # Grab from settings file?
+    self.date_format = 'D MMM'
+    self.time_format = "HH:mm"
+    self.language = 'en'
 
     self.timezone = get_system_tz()
     self.ical_urls = self.config['ical_urls']
@@ -220,7 +218,7 @@ class Calendar(inkycal_module):
       self._upcoming_events = upcoming_events
 
       # delete events which won't be able to fit (more events than lines)
-      upcoming_events[max_event_lines:]
+      upcoming_events[:max_event_lines]
 
 
       # Check if any events were found in the given timerange
@@ -262,6 +260,7 @@ class Calendar(inkycal_module):
                   (event_width_l, line_height), name, font=self.font,
                   alignment = 'left')
             else:
+              # change this event_width to event_width_s?
               write(im_black, (time_width, event_lines[cursor][1]),
                   (event_width, line_height), time, font=self.font,
                   alignment = 'left')
diff --git a/inkycal/modules/inkycal_rss.py b/inkycal/modules/inkycal_rss.py
index 51cc2dc..599fa33 100644
--- a/inkycal/modules/inkycal_rss.py
+++ b/inkycal/modules/inkycal_rss.py
@@ -37,7 +37,7 @@ class RSS(inkycal_module):
         raise Exception('config is missing {}'.format(param))
 
     # module name
-    self.name = filename
+    self.name = self.__class__.__name__
 
     # module specific parameters
     self.shuffle_feeds = True
diff --git a/inkycal/modules/inkycal_weather.py b/inkycal/modules/inkycal_weather.py
index 980f9d7..b525e58 100644
--- a/inkycal/modules/inkycal_weather.py
+++ b/inkycal/modules/inkycal_weather.py
@@ -39,7 +39,7 @@ class Weather(inkycal_module):
         raise Exception('config is missing {}'.format(param))
 
     # module name
-    self.name = filename
+    self.name = self.__class__.__name__
 
     # module specific parameters
     self.owm = pyowm.OWM(self.config['api_key'])
diff --git a/inkycal/modules/test_module.py b/inkycal/modules/test_module.py
index fa377cc..72d58ef 100644
--- a/inkycal/modules/test_module.py
+++ b/inkycal/modules/test_module.py
@@ -64,7 +64,7 @@ class simple(inkycal_module):
     super().__init__(section_size, section_config)
 
     # module name (required)
-    self.name = filename
+    self.name = self.__class__.__name__
 
     # module specific parameters (optional)
     self.do_something = True