Lots of issues fixed.