Initial passing L2L test, plus some bug fixes