Sounds like you've been beating the CMS into better shape already.