clean up and faq update