Fixed up a few variables