several smal bugfixes -> RC3