A little more cleaning and debugging, not much new to show for it.