Fix #48 and #55 and update FAQ