Fixed some variable names and data