Capture method
documentation improvement
minor fixes