Most of the issues fixed.