Many fixes. No time to explain.