diff --git a/src/musikbox/Main.cpp b/src/musikbox/Main.cpp
index 197a4ce3d..24f26f02f 100644
--- a/src/musikbox/Main.cpp
+++ b/src/musikbox/Main.cpp
@@ -164,14 +164,14 @@ int main(int argc, char* argv[]) {
 
         app.SetColorMode(colorMode);
 
-        /* set color theme */
+        /* theme */
         std::string colorTheme = prefs->GetString(musik::box::prefs::keys::ColorTheme);
         if (colorTheme.size()) {
             colorTheme = GetApplicationDirectory() + "/themes/" + colorTheme + ".json";
             app.SetColorTheme(colorTheme);
         }
 
-        /* tray icon options */
+        /* tray icon */
         app.SetMinimizeToTray(prefs->GetBool(musik::box::prefs::keys::MinimizeToTray, false));
         if (prefs->GetBool(musik::box::prefs::keys::StartMinimized, false)) {
             app.Minimize();
@@ -179,7 +179,7 @@ int main(int argc, char* argv[]) {
 
         app.SetMinimumSize(MIN_WIDTH, MIN_HEIGHT);
 
-        /* top-level layout */
+        /* main layout */
         using Main = std::shared_ptr<MainLayout>;
         Main mainLayout(new MainLayout(app, playback, transport, library));
 
@@ -193,7 +193,9 @@ int main(int argc, char* argv[]) {
             return globalHotkeys.Handle(kn);
         });
 
+        /* blocking event loop */
         app.Run(mainLayout);
+        /* done with the app *//
 
         mainLayout->Stop();
 
diff --git a/src/musikbox/cursespp/App.cpp b/src/musikbox/cursespp/App.cpp
index e0c4e1b47..524577c67 100755
--- a/src/musikbox/cursespp/App.cpp
+++ b/src/musikbox/cursespp/App.cpp
@@ -332,16 +332,12 @@ process:
         this->CheckShowOverlay();
         this->EnsureFocusIsValid();
 
-        /* note that order is important here! dispatch pending messages first,
-        because they may muck around with layout, then redraw the window. if
-        done in the reverse order, the user may observe more flicker. */
+        /* needs to happen here, or else flicker */
         Window::MessageQueue().Dispatch();
 
         if (Window::WriteToScreen(this->state.input)) {
-            /* if we wrote to the screen that means panels could have shifted
-            around. ensure any visible overlay is still on top. */
             if (this->state.overlayWindow && !this->state.overlayWindow->IsTop()) {
-                this->state.overlay->BringToTop();
+                this->state.overlay->BringToTop(); /* active overlay is always on top... */
             }
         }
     }
diff --git a/src/musikdroid/build.gradle b/src/musikdroid/build.gradle
index eb817571e..3f2a3a1e2 100644
--- a/src/musikdroid/build.gradle
+++ b/src/musikdroid/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha6'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha7'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }