Worked up support handling write-up.

- Also minor changes in detector.py.