small bugfixes, TODO item created.