small changes (adding var to some variables)