Sending an invalid state value to add_correspondence now aborts the entire operation
whitespace

includes various code layout fixes