Kelly, wouldn't now be the time to make the 4.0 jump? Since your already tweaking the system it is probably the best time.
Yup... that's exactly what I was thinking. I just need to get it all stabilized where I'm happy with it before making that next step.