Added arrays in assigments and fixed var/vars