Fixed different things, var here and there