Fixing demos and cleaning up build system