Demo and docs update