finish adding patch update and adjusting other circumstance methods and tests.