More work towards full uhc support, plus memory leak monitoring and other cleanups.