diff --git a/app/common/channellayout.h b/app/common/channellayout.h
index 7d62061eb..0273925a4 100644
--- a/app/common/channellayout.h
+++ b/app/common/channellayout.h
@@ -1,6 +1,33 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2019 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
 #ifndef CHANNELLAYOUT_H
 #define CHANNELLAYOUT_H
 
+/**
+ * Channel Layouts header
+ *
+ * We don't do much here at the moment, audio is a much simpler beast than video nowadays and FFmpeg seems to cover it
+ * fairly well.
+ */
+
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
diff --git a/app/core.cpp b/app/core.cpp
index 3e1c78ea0..b55acc54c 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -85,13 +85,13 @@ void Core::Start()
 
 
   //
-  // Start GUI (TODO CLI mode)
+  // Start GUI (FIXME CLI mode)
   //
 
   StartGUI(parser.isSet(fullscreen_option));
 
   // Create new project on startup
-  // TODO: Load project from startup_project_ instead if not empty
+  // FIXME: Load project from startup_project_ instead if not empty
   AddOpenProject(std::make_shared<Project>());
 }
 
diff --git a/app/decoder/probeserver.cpp b/app/decoder/probeserver.cpp
index 66d73dd04..18e7cc966 100644
--- a/app/decoder/probeserver.cpp
+++ b/app/decoder/probeserver.cpp
@@ -54,7 +54,7 @@ bool olive::ProbeMedia(Footage *f)
   for (int i=0;i<decoder_list.size();i++) {
     if (decoder_list.at(i)->Probe(f)) {
 
-      // TODO Some way of "attaching" the Footage to the Decoder without having to iterate through Decoders again at
+      // FIXME Some way of "attaching" the Footage to the Decoder without having to iterate through Decoders again at
       // render time?
 
       f->set_status(Footage::kReady);
diff --git a/app/dialog/sequence/sequence.cpp b/app/dialog/sequence/sequence.cpp
index dc191e0e9..eb0c88785 100644
--- a/app/dialog/sequence/sequence.cpp
+++ b/app/dialog/sequence/sequence.cpp
@@ -59,7 +59,6 @@ SequenceDialog::SequenceDialog(Sequence* s, Type t, QWidget* parent) :
   video_layout->addWidget(video_height_field_, 1, 1);
   video_layout->addWidget(new QLabel(tr("Frame Rate:")), 2, 0);
   video_frame_rate_field_ = new QComboBox();
-  // FIXME: No frame rate made
   video_layout->addWidget(video_frame_rate_field_, 2, 1);
   layout->addWidget(video_group);
 
diff --git a/app/project/projectviewmodel.cpp b/app/project/projectviewmodel.cpp
index 2b3f51ac4..52e2459c6 100644
--- a/app/project/projectviewmodel.cpp
+++ b/app/project/projectviewmodel.cpp
@@ -31,7 +31,7 @@ ProjectViewModel::ProjectViewModel(QObject *parent) :
   QAbstractItemModel(parent),
   project_(nullptr)
 {
-  // TODO make this configurable
+  // FIXME: make this configurable
   columns_.append(kName);
   columns_.append(kDuration);
   columns_.append(kRate);
@@ -424,7 +424,7 @@ void ProjectViewModel::RenameChild(Item *item, const QString &name)
 int ProjectViewModel::IndexOfChild(Item *item) const
 {
   // Find parent's index within its own parent
-  // (TODO: this model should handle sorting, which means it'll have to "know" the indices)
+  // (FIXME: this model should handle sorting, which means it'll have to "know" the indices)
 
   if (item == project_->root()) {
     return -1;
diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp
index 905ae5522..4e27d788c 100644
--- a/app/window/mainwindow/mainwindow.cpp
+++ b/app/window/mainwindow/mainwindow.cpp
@@ -56,7 +56,7 @@ olive::MainWindow::MainWindow(QWidget *parent) :
 
 void olive::MainWindow::ProjectOpen(Project* p)
 {
-  // TODO Use settings data to create panels and restore state if they exist
+  // FIXME Use settings data to create panels and restore state if they exist
   NodePanel* node_panel = olive::panel_focus_manager->CreatePanel<NodePanel>(this);
   addDockWidget(Qt::TopDockWidgetArea, node_panel);