capture fixes, tests