Patch 1

Not tested. Added new history and changed demo descriptions.