Fixed RS/WS, and cleaned up some output