all fixed up?  all tests passing anyhow