demo changes

** need to have debug mode as an option instead of a separate build