Refs #6

Small bits added.