Added various variable initializations