small var related changes