And cleaned up problem 4... even more