Doc updates and Faq