Fixing bugs, updating tests (with notes on future notes at least