and ity and peiyu's patches might help clarify the rest