[Projekt] ioGo # Smarthome to go
-
@nis habe in telegram auch true gesetzt, nun läuft der iogo Adapter.
Finde das aber sehr Aufwenig und ungünstig wenn user das anpassen müssen.edit: auf dem ersten Blick scheint jetzt alles zu gehen, teste mal weiter
-
@nis screenshot geht leider nicht anders
-
@crunchip
Wird bei dir das selbe sein wie bei mir, im objekten im raw nach common enabled suchen, und wenn nicht vorhanden, eben mit true oder false einfügen.@nis
Derzeit kommen noch ne Menge warn beim Start, bei fast allen states gefällt ihm value nicht, steht was von wrong type -
@e-s sagte in [Projekt] ioGo # Native Android App:
Finde das aber sehr Aufwenig und ungünstig wenn user das anpassen müssen.
Das soll auch keiner anpassen müssen. Nach meiner Auffassung sind das fehlerhafte Objekte. Ich muss nochmal prüfen, ob bei Adaptern das Attribut optional ist, dann muss ich das noch berücksichtigen.
Vielen Dank für deine Geduld und Unterstützung
-
@nis
wie gesagt, schau dir mal mqtt server und telegram an -
@nis
host.IoBroker2019-08-29 21:35:42.121errorinstance system.adapter.iogo.0 terminated with code 3 (Adapter disabled or invalid config)iogo.02019-08-29 21:35:41.833erroradapter disabledhost.IoBroker2019-08-29 21:35:33.476infoobject change system.adapter.iogo.0host.IoBroker2019-08-29 21:35:10.293infoRestart adapter system.adapter.iogo.0 because enabledhost.IoBroker2019-08-29 21:35:10.293errorinstance system.adapter.iogo.0 terminated with code 0 (OK)Caught2019-08-29 21:35:10.293errorby controller[0]: toString: [Function] }Caught2019-08-29 21:35:10.293errorby controller[0]: name: 'FirebaseError',Caught2019-08-29 21:35:10.293errorby controller[0]: code: 'invalid-argument',Caught2019-08-29 21:35:10.292errorby controller[0]: at WriteBatch.set (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20702:46)Caught2019-08-29 21:35:10.292errorby controller[0]: at UserDataConverter.parseSetData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19833:31)Caught2019-08-29 21:35:10.292errorby controller[0]: at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19968:25)Caught2019-08-29 21:35:10.292errorby controller[0]: at UserDataConverter.parseObject (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20009:13)Caught2019-08-29 21:35:10.292errorby controller[0]: at forEach (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:458:13)Caught2019-08-29 21:35:10.292errorby controller[0]: at /opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20010:41Caught2019-08-29 21:35:10.292errorby controller[0]: at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19994:29)Caught2019-08-29 21:35:10.292errorby controller[0]: at UserDataConverter.parseScalarValue (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20128:27)Caught2019-08-29 21:35:10.292errorby controller[0]: at ParseContext.createError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19781:16)Caught2019-08-29 21:35:10.292errorby controller[0]: at new FirestoreError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:354:28)Caught2019-08-29 21:35:10.292errorby controller[0]: { FirebaseError: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel)iogo.02019-08-29 21:35:10.249infolistener removediogo.02019-08-29 21:35:10.249infotriggered listener removediogo.02019-08-29 21:35:10.246infosigned outiogo.02019-08-29 21:35:10.239infolistener removediogo.02019-08-29 21:35:10.234infotriggered listener removediogo.02019-08-29 21:35:10.234infocleaned everything up...iogo.02019-08-29 21:35:10.233errorat WriteBatch.set (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20702:46)iogo.02019-08-29 21:35:10.233errorat UserDataConverter.parseSetData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19833:31)iogo.02019-08-29 21:35:10.233errorat UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19968:25)iogo.02019-08-29 21:35:10.233errorat UserDataConverter.parseObject (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20009:13)iogo.02019-08-29 21:35:10.233errorat forEach (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:458:13)iogo.02019-08-29 21:35:10.233errorat /opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20010:41iogo.02019-08-29 21:35:10.233errorat UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19994:29)iogo.02019-08-29 21:35:10.233errorat UserDataConverter.parseScalarValue (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20128:27)iogo.02019-08-29 21:35:10.233errorat ParseContext.createError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19781:16)iogo.02019-08-29 21:35:10.233errorat new FirestoreError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:354:28)iogo.02019-08-29 21:35:10.233errorFirebaseError: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel)iogo.02019-08-29 21:35:10.233erroruncaught exception: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel)iogo.02019-08-29 21:35:07.261infoinitialize app devicesiogo.02019-08-29 21:35:07.248inforegistering listener for uid:KWLijVAZTwX6lXz2ZVmbLC4Ne9c2iogo.02019-08-29 21:35:07.244infostates from remote database removediogo.02019-08-29 21:35:07.234infologged in as: xxxxxxxxxxxxxxxxxxxxxxxxxxx <= please keep this uid as your secretiogo.02019-08-29 21:35:07.233infolicence key found. licence valid until 2020-08-27 20:38:10iogo.02019-08-29 21:35:06.572infotriggered listener removed -
@e-s Laut der iobroker Doku ist common.enabled ein Pflichtattribut: https://github.com/ioBroker/ioBroker/blob/master/doc/SCHEMA.md#mandatory-attributes
Somit müsste das ein Bug des telegram/mqtt Adapters sein.
-
@nis
Da müssten dann am besten @Bluefox oder @apollon77 dann was dazu sagen -
@e-s sagte in [Projekt] ioGo # Native Android App:
@nis
Da müssten dann am besten @Bluefox oder @apollon77 dann was dazu sagenDie Doku kommt doch von @Bluefox und @apollon77, damit dürfte deren Sicht doch eigentlich klar sein.
Ich denke die Entwickler der betroffenen Adapter müssten etwas dazu sagen... -
@nis
Die beiden sind auch in den beiden Adaptern als pushend vorhanden. -
Es ist eine neue Version des iogo-Adapters unterwegs, dieser übersteht den Fehler eines fehlenden common.enabled bei Adaptern und schreibt dies nur ins Log
-
Ok, jetzt bitte mal kurz zusammenfassend: Ja die genannten Mandatory sollten da sein, Wo gibt es denn Fälle das was fehlt und was genau? Ich habe einige "hoch" gelesen, finde aber keine Objektauszüge oder so
-
@apollon77 z.B. der telegram Adapter hat kein common.enabled
-
@nis "Der telegram Adapter" ... in seinem system.adapter.telegram.x oder in welchem Objekt genau? Bei mir hat system.adapter.telegram.0 ein enabled ...
-
@apollon77 ich meine den Adapter selber, also nicht die Instanz
-
@nis Naja es steht nirgends das ein Adapter ein "enabled" Flag im io-package haben muss. Es ist fast überall drin - wenn nicht vorhanden gilt "false" ...
-
@apollon77 doch. hier steht das die Angabe mandatory ist: https://github.com/ioBroker/ioBroker/blob/master/doc/SCHEMA.md#adapter
Oder hab ich was verwechselt?
-
@nis Ahhh stimm ... na dann Issues bei den Adaptern öffnen das es da gefixt werden kann, Korrekt? Oder gleich nen PR
-
@apollon77 Perfekt, danke für deine Unterstützung
-
@nis habe jetzt mal v 0.4.1 installiert
iogo.0 2019-08-30 01:27:01.848 info signed out iogo.0 2019-08-30 01:27:01.822 info triggered listener removed iogo.0 2019-08-30 01:27:01.820 info cleaned everything up... iogo.0 2019-08-30 01:27:01.339 info triggered listener removed iogo.0 2019-08-30 01:27:01.099 info starting. Version 0.4.1 in /opt/iobroker/node_modules/iobroker.iogo, node: v10.16.0 iogo.0 2019-08-30 01:26:29.180 info listener removed iogo.0 2019-08-30 01:26:29.180 info triggered listener removed iogo.0 2019-08-30 01:26:29.177 info signed out iogo.0 2019-08-30 01:26:29.168 info listener removed iogo.0 2019-08-30 01:26:29.162 info triggered listener removed iogo.0 2019-08-30 01:26:29.162 info cleaned everything up... iogo.0 2019-08-30 01:26:29.161 error at WriteBatch.set (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20667:46) iogo.0 2019-08-30 01:26:29.161 error at UserDataConverter.parseSetData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19833:31) iogo.0 2019-08-30 01:26:29.161 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19968:25) iogo.0 2019-08-30 01:26:29.161 error at UserDataConverter.parseObject (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20009:13) iogo.0 2019-08-30 01:26:29.161 error at forEach (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:458:13) iogo.0 2019-08-30 01:26:29.161 error at /opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20010:41 iogo.0 2019-08-30 01:26:29.161 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19994:29) iogo.0 2019-08-30 01:26:29.161 error at UserDataConverter.parseScalarValue (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20128:27) iogo.0 2019-08-30 01:26:29.161 error at ParseContext.createError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19781:16) iogo.0 2019-08-30 01:26:29.161 error at new FirestoreError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:354:28) iogo.0 2019-08-30 01:26:29.161 error FirebaseError: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:26:29.161 error uncaught exception: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:26:28.754 info Object iogo.0.lalala.name created iogo.0 2019-08-30 01:26:28.753 info Object iogo.0.lalala.token created iogo.0 2019-08-30 01:26:26.438 warn setObject iogo.0.lalala.name (type=state) property native missing! iogo.0 2019-08-30 01:26:26.432 warn setObject iogo.0.lalala.token (type=state) property native missing! iogo.0 2019-08-30 01:26:26.280 info initialize app devices iogo.0 2019-08-30 01:26:26.264 info states from remote database removed iogo.0 2019-08-30 01:26:26.253 info logged in as: xyz <= please keep this uid as your secret iogo.0 2019-08-30 01:26:26.253 info licence key found. licence valid until 2020-08-27 20:38:10 iogo.0 2019-08-30 01:26:24.971 info triggered listener removed iogo.0 2019-08-30 01:26:24.840 info starting. Version 0.4.1 in /opt/iobroker/node_modules/iobroker.iogo, node: v10.16.0 iogo.0 2019-08-30 01:25:53.256 info listener removed iogo.0 2019-08-30 01:25:53.255 info triggered listener removed iogo.0 2019-08-30 01:25:53.251 info signed out iogo.0 2019-08-30 01:25:53.243 info listener removed iogo.0 2019-08-30 01:25:53.237 info triggered listener removed iogo.0 2019-08-30 01:25:53.237 info cleaned everything up... iogo.0 2019-08-30 01:25:53.236 error at WriteBatch.set (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20667:46) iogo.0 2019-08-30 01:25:53.236 error at UserDataConverter.parseSetData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19833:31) iogo.0 2019-08-30 01:25:53.236 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19968:25) iogo.0 2019-08-30 01:25:53.236 error at UserDataConverter.parseObject (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20009:13) iogo.0 2019-08-30 01:25:53.236 error at forEach (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:458:13) iogo.0 2019-08-30 01:25:53.236 error at /opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20010:41 iogo.0 2019-08-30 01:25:53.236 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19994:29) iogo.0 2019-08-30 01:25:53.236 error at UserDataConverter.parseScalarValue (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20128:27) iogo.0 2019-08-30 01:25:53.236 error at ParseContext.createError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19781:16) iogo.0 2019-08-30 01:25:53.236 error at new FirestoreError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:354:28) iogo.0 2019-08-30 01:25:53.236 error FirebaseError: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:25:53.236 error uncaught exception: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:25:50.280 info initialize app devices iogo.0 2019-08-30 01:25:50.263 info states from remote database removed iogo.0 2019-08-30 01:25:50.251 info logged in as: xyz <= please keep this uid as your secret iogo.0 2019-08-30 01:25:50.250 info licence key found. licence valid until 2020-08-27 20:38:10 iogo.0 2019-08-30 01:25:49.445 info triggered listener removed iogo.0 2019-08-30 01:25:49.288 info starting. Version 0.4.1 in /opt/iobroker/node_modules/iobroker.iogo, node: v10.16.0 iogo.0 2019-08-30 01:25:17.772 info listener removed iogo.0 2019-08-30 01:25:17.772 info triggered listener removed iogo.0 2019-08-30 01:25:17.769 info signed out iogo.0 2019-08-30 01:25:17.763 info listener removed iogo.0 2019-08-30 01:25:17.758 info triggered listener removed iogo.0 2019-08-30 01:25:17.758 info cleaned everything up... iogo.0 2019-08-30 01:25:17.757 error at WriteBatch.set (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20667:46) iogo.0 2019-08-30 01:25:17.757 error at UserDataConverter.parseSetData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19833:31) iogo.0 2019-08-30 01:25:17.757 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19968:25) iogo.0 2019-08-30 01:25:17.757 error at UserDataConverter.parseObject (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20009:13) iogo.0 2019-08-30 01:25:17.757 error at forEach (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:458:13) iogo.0 2019-08-30 01:25:17.757 error at /opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20010:41 iogo.0 2019-08-30 01:25:17.757 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19994:29) iogo.0 2019-08-30 01:25:17.757 error at UserDataConverter.parseScalarValue (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20128:27) iogo.0 2019-08-30 01:25:17.757 error at ParseContext.createError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19781:16) iogo.0 2019-08-30 01:25:17.757 error at new FirestoreError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:354:28) iogo.0 2019-08-30 01:25:17.757 error FirebaseError: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:25:17.757 error uncaught exception: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:25:15.029 info initialize app devices iogo.0 2019-08-30 01:25:15.010 info states from remote database removed iogo.0 2019-08-30 01:25:14.997 info logged in as: xyz <= please keep this uid as your secret iogo.0 2019-08-30 01:25:14.996 info licence key found. licence valid until 2020-08-27 20:38:10 iogo.0 2019-08-30 01:25:14.324 info triggered listener removed iogo.0 2019-08-30 01:25:14.180 info starting. Version 0.4.1 in /opt/iobroker/node_modules/iobroker.iogo, node: v10.16.0 iogo.0 2019-08-30 01:24:42.203 info listener removed iogo.0 2019-08-30 01:24:42.203 info triggered listener removed iogo.0 2019-08-30 01:24:42.200 info signed out iogo.0 2019-08-30 01:24:42.192 info listener removed iogo.0 2019-08-30 01:24:42.185 info triggered listener removed iogo.0 2019-08-30 01:24:42.185 info cleaned everything up... iogo.0 2019-08-30 01:24:42.184 error at WriteBatch.set (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20667:46) iogo.0 2019-08-30 01:24:42.184 error at UserDataConverter.parseSetData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19833:31) iogo.0 2019-08-30 01:24:42.184 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19968:25) iogo.0 2019-08-30 01:24:42.184 error at UserDataConverter.parseObject (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20009:13) iogo.0 2019-08-30 01:24:42.184 error at forEach (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:458:13) iogo.0 2019-08-30 01:24:42.184 error at /opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20010:41 iogo.0 2019-08-30 01:24:42.184 error at UserDataConverter.parseData (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19994:29) iogo.0 2019-08-30 01:24:42.184 error at UserDataConverter.parseScalarValue (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:20128:27) iogo.0 2019-08-30 01:24:42.184 error at ParseContext.createError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:19781:16) iogo.0 2019-08-30 01:24:42.184 error at new FirestoreError (/opt/iobroker/node_modules/iobroker.iogo/node_modules/@firebase/firestore/dist/index.node.cjs.js:354:28) iogo.0 2019-08-30 01:24:42.184 error FirebaseError: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:24:42.184 error uncaught exception: Function WriteBatch.set() called with invalid data. Unsupported field value: undefined (found in field loglevel) iogo.0 2019-08-30 01:24:38.856 info initialize app devices iogo.0 2019-08-30 01:24:38.840 info states from remote database removed iogo.0 2019-08-30 01:24:38.825 info logged in as: xyz <= please keep this uid as your secret iogo.0 2019-08-30 01:24:38.824 info licence key found. licence valid until 2020-08-27 20:38:10 iogo.0 2019-08-30 01:24:37.983 info triggered listener removed iogo.0 2019-08-30 01:24:37.867 info starting. Version 0.4.1 in /opt/iobroker/node_modules/iobroker.iogo, node: v10.16.0 iogo.0 2019-08-30 01:24:06.323 info listener removed iogo.0 2019-08-30 01:24:06.323 info triggered listener removed iogo.0 2019-08-30 01:24:06.320 info signed out iogo.0 2019-08-30 01:24:06.312 info listener removed iogo.0 2019-08-30 01:24:06.307 info triggered listener removed iogo.0 2019-08-30 01:24:06.307 info cleaned everything up...
