Some docs and adjustment