diff --git a/telldus-gui/TelldusGui/device.cpp b/telldus-gui/TelldusGui/device.cpp
index 9121cbe3..c413c356 100644
--- a/telldus-gui/TelldusGui/device.cpp
+++ b/telldus-gui/TelldusGui/device.cpp
@@ -81,9 +81,6 @@ QString &Device::name() const {
 }
 
 void Device::setParameter( const QString &name, const QString &value ) {
-	if(name == "devices"){
-		d->protocolChanged = true;
-	}
 	d->settings[name] = value;
 }
 
diff --git a/telldus-gui/TelldusGui/editgroupdialog.cpp b/telldus-gui/TelldusGui/editgroupdialog.cpp
index 582b0b38..ff26b768 100644
--- a/telldus-gui/TelldusGui/editgroupdialog.cpp
+++ b/telldus-gui/TelldusGui/editgroupdialog.cpp
@@ -131,12 +131,12 @@ void EditGroupDialog::setDevicesVisible(){
 		devices << device.toInt();
 	}
 
-	for (int i = 0; i < model->rowCount(); ++i){
-		int id = model->deviceId(model->index(i, 0));
-		if (id == device->id()) {
-			//shouldnt be able to add itself, check that here
-			availableProxyModel->hideRow(i);
-		} else if (devices.contains(id)) {
+	for (int i = 0; i < model->rowCount(); ++i){
+		int id = model->deviceId(model->index(i, 0));
+		if (id == device->id()) {
+			//shouldnt be able to add itself, check that here
+			availableProxyModel->hideRow(i);
+		} else if (devices.contains(id)) {
 			availableProxyModel->hideRow(i);
 			addedProxyModel->showRow(i);
 		}
@@ -201,8 +201,8 @@ void ProxyModel::showAllRows() {
 
 QString ProxyModel::getShownIds(){
 	QStringList addedIds;
-	foreach (int index, rows){	//TODO why does this crash when debugging? Unsafe?
-		if(index >= 0){	//TODO why can this be 
+	foreach (int index, rows){
+		if(index >= 0){ 
 			DeviceModel *model = reinterpret_cast<DeviceModel *>(this->sourceModel());
 			if (model) {
 				int deviceId = model->deviceId(model->index(index, 0));
diff --git a/telldus-gui/TelldusGui/methodwidget.cpp b/telldus-gui/TelldusGui/methodwidget.cpp
index ac30ac29..8bf363d6 100644
--- a/telldus-gui/TelldusGui/methodwidget.cpp
+++ b/telldus-gui/TelldusGui/methodwidget.cpp
@@ -96,7 +96,7 @@ MethodWidget::MethodWidget( Device *device, QWidget *parent )
 	connect(d->execute, SIGNAL(clicked()), device, SLOT(execute()));
 	connect(d->up, SIGNAL(clicked()), device, SLOT(up()));
 	connect(d->down, SIGNAL(clicked()), device, SLOT(down()));
-	//TODO connect(d->stop, SIGNAL(clicked()), device, SLOT(stop()));
+	connect(d->stop, SIGNAL(clicked()), device, SLOT(stop()));
 
 
 	updateMethods(device->methods());