another update

Very close to 100% test pass this time, I think.