faq, minor bug fixes