Bringing in updates from the SERVe project.

I made some improvements and some new partials as a part of our work on SERVe. Want to make sure it gets back in.