Polishing things up. refs #418