* Command line option needs fixing, too (enable shortcut!) * Demo mode itself still needs improvements