more work-in-progress
things are generally working again