refs #7: Cleaned up substrates.
Refs #7: I can't spell