Changed some variable names and some silly errors.