Fix normal port termination
Add raw/binary output