diff --git a/.luacheckrc b/.luacheckrc
index 6c2efe3..52a90dc 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -4,12 +4,15 @@
 globals = {
   "AsciiArt",
   "Ascension",
+  "AscendDebugWindow",
   "Audio",
   "AudioTestWindow",
   "BriefIntroWindow",
   "CodeGenerator",
   "Config",
+  "CommuteGlitch",
   "Context",
+  "ContextDebug",
   "ContinuedWindow",
   "ControlsWindow",
   "CreditsWindow",
@@ -67,6 +70,7 @@ globals = {
   "music",
   "musicator_generate_pattern",
   "pix",
+  "poke4",
   "print",
   "rect",
   "rectb",
diff --git a/impostor.inc b/impostor.inc
index 0000088..54563c9 100644
--- a/impostor.inc
+++ b/impostor.inc
@@ -1,9 +1,7 @@
 meta/meta.header.lua
 init/init.module.lua
 init/init.config.lua
-init/init.ascension.lua
 init/init.context.lua
-init/init.context_debug.lua
 system/system.util.lua
 system/system.print.lua
 system/system.input.lua
@@ -11,6 +9,7 @@ system/system.textinput.lua
 system/system.mouse.lua
 system/system.asciiart.lua
 system/system.rle.lua
+logic/logic.ascension.lua
 logic/logic.meter.lua
 logic/logic.focus.lua
 logic/logic.day.lua
@@ -21,6 +20,7 @@ logic/logic.glitch.lua
 logic/logic.commute_glitch.lua
 logic/logic.codegenerator.lua
 logic/logic.discussion.lua
+system/system.debug.lua
 system/system.ui.lua
 audio/audio.manager.lua
 audio/audio.generator.lua
diff --git a/inc/audio/audio.manager.lua b/inc/audio/audio.manager.lua
index 9b9d779..1f9cab0 100644
--- a/inc/audio/audio.manager.lua
+++ b/inc/audio/audio.manager.lua
@@ -15,12 +15,12 @@ end
 
 --- Plays track at optional speed. Doesn't restart if track and speed are unchanged.
 --- @param track number Track index.
---- @param[opt] speed number TIC-80 music speed override (-1 = default).
-function Audio.music_play(track, speed)
-    if Audio.music_playing ~= track or Audio.music_playing_tempo ~= speed then
-        music(track, -1, -1, true, false, -1, speed or -1)
+--- @param[opt] tempo number TIC-80 music speed override (-1 = default).
+function Audio.music_play(track, tempo)
+    if Audio.music_playing ~= track or Audio.music_playing_tempo ~= tempo then
+        music(track, -1, -1, true, false, -1, tempo or -1)
         Audio.music_playing = track
-        Audio.music_playing_tempo = speed
+        Audio.music_playing_tempo = tempo
     end
 end
 
@@ -54,8 +54,8 @@ function Audio.music_play_room_() end
 
 --- Plays room work music. Speed scales with commute glitch level when active.
 --- @within Audio
-function Audio.music_play_room_work(speed)
-    Audio.music_play(0, speed or -1)
+function Audio.music_play_room_work(tempo)
+    Audio.music_play(0, tempo or -1)
 end
 
 --- Plays activity work music.
diff --git a/inc/decision/decision.go_to_truth.lua b/inc/decision/decision.go_to_truth.lua
index 5029018..89ce13a 100644
--- a/inc/decision/decision.go_to_truth.lua
+++ b/inc/decision/decision.go_to_truth.lua
@@ -6,7 +6,7 @@ Decision.register({
   end,
   handle = function()
     CommuteGlitch.enter_truth()
-    
+
     Util.go_to_screen_by_id("office")
   end,
 })
diff --git a/inc/init/init.ascension.lua b/inc/logic/logic.ascension.lua
similarity index 100%
rename from inc/init/init.ascension.lua
rename to inc/logic/logic.ascension.lua
diff --git a/inc/screen/screen.mysterious_man.lua b/inc/screen/screen.mysterious_man.lua
index 1219aa3..438c437 100644
--- a/inc/screen/screen.mysterious_man.lua
+++ b/inc/screen/screen.mysterious_man.lua
@@ -81,8 +81,8 @@ local ASC_67_TEXT = [[
 ]]
 
 local ASC_78_TEXT = [[
-  The situation has reached 
-  
+  The situation has reached
+
   critical levels.
 
   Norman is fully aware...
@@ -94,23 +94,23 @@ local ASC_78_TEXT = [[
 
 local ASC_89_TEXT = [[
   Norman
-  
-  you created this simulation 
-  
+
+  you created this simulation
+
   in the first place.
 
   I know,
-  
+
   you don't want to face
-  
+
   the world you left behind.
 
   You, yourself,
-  
+
   have forgoten that.
 
-  But 
-  
+  But
+
   it doesn't matter anymore.
 
 
@@ -119,21 +119,21 @@ local ASC_89_TEXT = [[
   You actually are more
 
   than you think you are.
-  
 
-  
+
+
   so now
 
 
 
   you need to wake up
-  
+
   and stop your best creation
-  
+
   before it takes over
 
   the world
-  
+
 
 
 
@@ -143,9 +143,9 @@ local ASC_89_TEXT = [[
 
 
   you really need to stop
-  
-  talking to yourself 
-  
+
+  talking to yourself
+
   in your sleep.
 
 
diff --git a/inc/init/init.context_debug.lua b/inc/system/system.debug.lua
similarity index 100%
rename from inc/init/init.context_debug.lua
rename to inc/system/system.debug.lua