Improvement to documentation and FAQ