Don't be scared. You're doing good work. I'll play with your changes and see if they break anything

Welcome back!
It's not so much about being scared; More that I didn't do a bunch of little commits and comment the specific changes. I would have liked to have done that...at least so they could be submitted as separate changesets/patches for you to look at.
I *have* done that for the next couple commits
