Fixed typos and different variable names etc so everything compiles again.

So this github merge streak stuff is nice as it motives you to keep doing stuff,
but on days like this when you have an ear infection and can't think anymore
it's not so great.