More minor improvements to capturer