disables tornado, small bugfixes