fix bugs and update faq