I've cleaned up the STF a little. It's looking better now, I hope I can move it forward. Consolidaton and Input Validation are still in Jody's patch-review queue so I'll have to wait a while with those.
Anyway, Exam week coming up so I probably won't have all that much time to code. New PC hasn't arrived yet, probably next week or so.