more deployment stuff, bugfixes