Demo moved, some log & debug messages added