small bugfixes, soon running