added some more stuff to the hotfix branch