Update docs, start to switch to haystack