- cleanup
- changed triggering of CaptureActitvity