Almost all fixed now.