Small progress in teapo2.