Better demo & docs