Getting close... most memory holes fixed