More text and polishing Source and Sink