doc updated, and fixes