Continuing to work, mostly on testing, but also a bit of tweaking as I go along.