Bug fixes, testing, and DemoConsole App