4 files changed, 7 insertions, 10 deletions

diff --git a/README.md b/README.md
index 5fe66769..adba9dd0 100644
--- a/README.md
+++ b/README.md
@@ -27,12 +27,12 @@ and published [on GitHub](https://github.com/SirCmpwn/sway/releases).
 Sway is not supported by many distributions yet. Here's a list of packages
 available for you to install:
 
-* [Arch Linux](https://www.archlinux.org/packages/?q=sway)
-* [Gentoo](https://packages.gentoo.org/packages/dev-libs/sway)
-* [NixOS](https://github.com/NixOS/nixpkgs/tree/b4bae44f13ba9598209ae9e6a0bb5d4194bf79aa/pkgs/applications/window-managers/sway)
-* [openSUSE Tumbleweed](https://software.opensuse.org/package/sway)
+* [Arch Linux](https://github.com/SirCmpwn/sway/wiki/Install-from-packages#arch)
+* [Gentoo](https://github.com/SirCmpwn/sway/wiki/Install-from-packages#gentoo)
+* [NixOS](https://github.com/SirCmpwn/sway/wiki/Install-from-packages#nixos)
+* [openSUSE Tumbleweed](https://github.com/SirCmpwn/sway/wiki/Install-from-packages#opensuse)
 
-For other distros, [see this wiki page](https://github.com/SirCmpwn/sway/wiki/Install-on-other-distros).
+For other distros, [see this wiki page](https://github.com/SirCmpwn/sway/wiki/Install-from-packages#unofficial-packages).
 If you're interested in packaging Sway for your distribution, stop by the IRC
 channel or shoot an email to sir@cmpwn.com for advice.
 
diff --git a/config b/config
index 6d3f1530..e127207b 100644
--- a/config
+++ b/config
@@ -3,9 +3,6 @@
 # Copy this to ~/.config/sway/config and edit it to your liking.
 #
 # Read `man 5 sway` for a complete reference.
-#
-# Sway is a work in progress. Some of these defaults are currently unimplemented.
-
 
 ### Variables
 #
diff --git a/sway/border.c b/sway/border.c
index 9bc25816..55628972 100644
--- a/sway/border.c
+++ b/sway/border.c
@@ -234,7 +234,7 @@ static char *generate_container_title(swayc_t *container) {
         for (i = 0; i < container->children->length; ++i) {
                 prev_name = name;
                 swayc_t* child = container->children->items[i];
-                const char *title = child->name;
+                const char *title = child->app_id;
                 if (child->type == C_CONTAINER) {
                         title = generate_container_title(child);
                 }
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 41538052..e3e53622 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -99,7 +99,7 @@ static void mouse_scroll_notify(struct window *window, enum scroll_direction dir
         if (!swaybar.config->wrap_scroll) {
                 // Find output this window lives on
                 int i;
-                struct output *output;
+                struct output *output = NULL;
                 for (i = 0; i < swaybar.outputs->length; ++i) {
                         output = swaybar.outputs->items[i];
                         if (output->window == window) {