Small changes; mainly in the listener system: