More stuff patched up but lots to go