yes, and some other changes. Didn't have the time to do this before my holiday, I'll do it tomorrow.