some adds to hotfix branch