refs #75 Fix some reference issues
refs #82 Fix some wording issues