doc pass, semi-decent now