More debugging, and more progress