small bugfixes, working on SRT