Fixed correlation code, beginning to fix model prep