small bugfixes, comment updates