Proximity - better comments, logs and controls