various fixes, fix deploy script