Added needed initialization to more variables that I forgot to initialize.