Added untested code for OK and ACK

Changed other stuff