Refs #429. Fixed a couple variable issues.
Refs #429. Updated CHANGELOG.