Add ack handling and fix fault mechanism