Still some display errors, but pretty much finished