Added demo file, fixed some bugs, updated schema