Enhance ClickStart and docs