Enhance README and fix doc