Fix readme; adjust demo files;