Improve docs and improve base example