some updates/bugfixes from master