Update ACK format in spec. Minor cosmetic fixes. Add @todos.