small bugfixes. i think, that's bugfixes.