Some more tinkering done.