More bug fixes, and progress on opentok.