good checkpoint. quite a few fixes.