More var improvements