Updated defaults, docs and demo