Minor changes, consolidated read & write file descriptors into one.