Fixed most problems.