Fixed all but one issue.