Fixed too many things. Created too many new problems.