fix up remote interface stuff almost