separate content and fix doc