update markup, fix doc