hotfix and more improvements