Demo displays better messages now; some errors fixed.