Condensed demo stuff down; bug fixes