Adding a smoothing function to the commbined plot macro, and fixing a few bugs in other places.