updates to docs; merged quickstart