add cambridge, ios; more tests; misc bug fixes