refs #522 - more demo improvements