Last of main issues fixed.