Refs #15
Refs #20
Refs #27

Some enhancements.