finish remove unneeded returns, import debug to everything, add header

src/fenrir-package/braille/braille.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class braille():
     def __init__(self):

src/fenrir-package/commands/command_template.py

@@ -1,5 +1,10 @@
 #!/bin/python
-from utils import debug
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/add_word_to_spell_check.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 initialized = False
 try:

src/fenrir-package/commands/commands/clear_clipboard.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/copy_marked_to_clipboard.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import mark_utils
 
 class command():

src/fenrir-package/commands/commands/curr_char.py

@@ -1,5 +1,11 @@
 #!/bin/python
 from utils import char_utils
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/curr_char_phonetic.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import char_utils
 
 class command():

src/fenrir-package/commands/commands/curr_clipboard.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/curr_line.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import line_utils
 
 class command():

src/fenrir-package/commands/commands/curr_screen.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/curr_screen_after_cursor.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import mark_utils
 
 class command():

src/fenrir-package/commands/commands/curr_screen_before_cursor.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import mark_utils
 
 class command():

src/fenrir-package/commands/commands/curr_word.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 
 class command():

src/fenrir-package/commands/commands/curr_word_phonetic.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 from utils import char_utils
 

src/fenrir-package/commands/commands/cursor_position.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/date.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import datetime
 
 class command():

src/fenrir-package/commands/commands/dec_sound_volume.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/dec_speech_pitch.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/dec_speech_rate.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/dec_speech_volume.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/exit_review.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/first_clipboard.py

@@ -1,8 +1,10 @@
 #!/bin/python
-import fcntl
+# -*- coding: utf-8 -*-
-import sys
-import termios
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/forward_keypress.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/inc_sound_volume.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/inc_speech_pitch.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/inc_speech_rate.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/inc_speech_volume.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import math
 
 class command():

src/fenrir-package/commands/commands/indent_curr_line.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import line_utils
 
 class command():

src/fenrir-package/commands/commands/last_clipboard.py

@@ -1,8 +1,10 @@
 #!/bin/python
-import fcntl
+# -*- coding: utf-8 -*-
-import sys
-import termios
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/last_incomming.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/linux_paste_clipboard.py

@@ -1,8 +1,13 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import fcntl
-import sys
 import termios
-import time
+import time, sys
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/marked_text.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import mark_utils
 
 class command():

src/fenrir-package/commands/commands/next_char.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import char_utils
 
 class command():

src/fenrir-package/commands/commands/next_clipboard.py

@@ -1,8 +1,10 @@
 #!/bin/python
-import fcntl
+# -*- coding: utf-8 -*-
-import sys
-import termios
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/next_line.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import line_utils
 
 class command():

src/fenrir-package/commands/commands/next_word.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 
 class command():

src/fenrir-package/commands/commands/prev_char.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import char_utils
 
 class command():

src/fenrir-package/commands/commands/prev_clipboard.py

@@ -1,8 +1,10 @@
 #!/bin/python
-import fcntl
+# -*- coding: utf-8 -*-
-import sys
-import termios
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/prev_line.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import line_utils
 
 class command():

src/fenrir-package/commands/commands/prev_word.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 
 class command():

src/fenrir-package/commands/commands/quit_fenrir.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/remove_marks.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/remove_word_from_spell_check.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 initialized = False
 try:
@@ -24,12 +30,12 @@ class command():
     def run(self, environment):
         if not initialized:
            environment['runtime']['outputManager'].presentText(environment, 'pychant is not installed', interrupt=True) 
-           return environment
+           return
         if environment['runtime']['settingsManager'].getSetting(environment, 'general', 'spellCheckLanguage') != self.language:
             try:
                 self.updateSpellLanguage(environment)
             except:
-                return environment    
+                return    
 
         if (environment['screenData']['newCursorReview'] != None):
             cursorPos = environment['screenData']['newCursorReview'].copy()

src/fenrir-package/commands/commands/review_bottom.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/review_top.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import char_utils
 
 class command():

src/fenrir-package/commands/commands/set_mark.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/shut_up.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/spell_check.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 initialized = False
 try:

src/fenrir-package/commands/commands/time.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import datetime
 
 class command():

src/fenrir-package/commands/commands/toggle_auto_read.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 class command():
     def __init__(self):
         pass

src/fenrir-package/commands/commands/toggle_auto_spell_check.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/toggle_braille.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/toggle_output.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/toggle_sound.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/toggle_speech.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/commands/toggle_tutorial_mode.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onInput/10000-shut_up.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onInput/54000-present_char_if_cursor_change_horizontal.py

@@ -1,5 +1,11 @@
 #!/bin/python
-import time
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
+
 class command():
     def __init__(self):
         pass

src/fenrir-package/commands/onInput/55000-present_line_if_cursor_change_vertical.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onScreenChanged/50000-char_echo.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onScreenChanged/60000-word_echo.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 
 class command():

src/fenrir-package/commands/onScreenChanged/62000-spell_check.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from utils import word_utils
 initialized = False
 try:

src/fenrir-package/commands/onScreenChanged/65000-char_delete_echo.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onScreenChanged/70000-incomming.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onScreenChanged/75000-incomming_promote.py

@@ -1,5 +1,11 @@
 #!/bin/python
 import time
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onScreenChanged/80000-screen_change_announcement.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onScreenChanged/85000-screen_chnage_reset_marks.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/commands/onScreenChanged/88000-screen_chnage_leve_review_mode.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class command():
     def __init__(self):

src/fenrir-package/core/commandManager.py

@@ -1,7 +1,12 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
 import importlib.util
 import glob, os, time
-from utils import debug
+from core import debug
 
 class commandManager():
     def __init__(self):

src/fenrir-package/core/commands.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import time
 
 

src/fenrir-package/core/environment.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 from core import settings
 from core import runtime
 from core import screenData

src/fenrir-package/core/generalInformation.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 generalInformation = {
 'running': True,

src/fenrir-package/core/inputEvent.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import time
 
 input = {

src/fenrir-package/core/inputManager.py

@@ -1,7 +1,11 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
 
 import time
-from utils import debug
+from core import debug
 from core import inputEvent
 
 class inputManager():

src/fenrir-package/core/outputManager.py

@@ -1,5 +1,10 @@
 #!/bin/python
-from utils import debug
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 class outputManager():
     def __init__(self):

src/fenrir-package/core/runtime.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 runtime = {
 'speechDriver': None,

src/fenrir-package/core/screenData.py

@@ -1,5 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import time
 
 screenData = {

src/fenrir-package/core/screenManager.py

@@ -1,6 +1,11 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import time
-from utils import debug
 
 class screenManager():
     def __init__(self):

src/fenrir-package/core/settings.py

@@ -1,6 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
-from utils import debug
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 settings = {
 'sound': {

src/fenrir-package/core/settingsManager.py

@@ -1,4 +1,8 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
 
 import importlib.util
 import os
@@ -9,7 +13,7 @@ from core import commandManager
 from core import screenManager
 from core import environment 
 from core.settings import settings
-from utils import debug
+from core import debug
 
 class settingsManager():
     def __init__(self):

src/fenrir-package/fenrir.py

@@ -10,7 +10,7 @@ if not os.getcwd() in sys.path:
     sys.path.append(os.getcwd())
 
 from core import settingsManager
-from utils import debug
+from core import debug
 
 class fenrir():
     def __init__(self):

src/fenrir-package/inputDriver/evdev.py

@@ -1,12 +1,16 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
 
 import evdev
-from evdev import InputDevice, UInput
 import time
+from evdev import InputDevice, UInput
 from select import select
 
 from core import inputEvent
-from utils import debug
+from core import debug
 
 class driver():
     def __init__(self):

src/fenrir-package/screenDriver/linux.py

@@ -1,9 +1,12 @@
 #!/bin/python
 # -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
 import difflib
 import subprocess
-from utils import debug
+from core import debug
 
 class driver():
     def __init__(self):
@@ -50,10 +53,10 @@ class driver():
             newContentBytes = vcsa.read()
             vcsa.close()
             if len(newContentBytes) < 5:
-                return environment
+                return
         except Exception as e:
             environment['runtime']['debug'].writeDebugOut(environment,str(e),debug.debugLevel.ERROR)   
-            return environment
+            return
         screenEncoding = environment['runtime']['settingsManager'].getSetting(environment,'screen', 'encoding')
         # set new "old" values
         environment['screenData']['oldContentBytes'] = environment['screenData']['newContentBytes']

src/fenrir-package/soundDriver/generic.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import subprocess
 
 class driver():

src/fenrir-package/soundDriver/gstreamer.py

@@ -1,3 +1,10 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 import gi
 import time
 from gi.repository import GLib

src/fenrir-package/speechDriver/espeak.py

@@ -1,7 +1,12 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
 # Espeak driver
 
+from core import debug
+
 class driver():
     def __init__(self ):
         self._es = None

src/fenrir-package/speechDriver/generic.py

@@ -1,7 +1,12 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
 # generic driver
 
+from core import debug
+
 class driver():
     def __init__(self ):
         pass

src/fenrir-package/speechDriver/speechd.py

@@ -1,7 +1,12 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
 # speech-dispatcher driver
 
+from core import debug
+
 class driver():
     def __init__(self ):
         self._sd = None
@@ -14,14 +19,14 @@ class driver():
         except:
             self._initialized = False
     def initialize(self, environment):
-        return environment
+        pass
     def shutdown(self, environment):
         if not self._isInitialized:
-            return environment
+            return
         self._isInitialized = False
         self.cancel()
         self._sd.close()
-        return environment
+        return
         
     def speak(self,text, queueable=True):
         if not self._isInitialized:

src/fenrir-package/utils/char_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getPrevChar(currX,currY, currText):
     if currText == '':

src/fenrir-package/utils/line_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getPrevLine(currX,currY, currText):
     if currText == '':

src/fenrir-package/utils/mark_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getTextBetweenMarks(firstMark, secondMark, inText):
     if inText == None:

src/fenrir-package/utils/review_utils.py

@@ -1,3 +1,8 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
 
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 

src/fenrir-package/utils/word_utils.py

@@ -1,4 +1,10 @@
 #!/bin/python
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from core import debug
 
 def getPrevWord(currX,currY, currText):
     if currText == '':