update for custom variabled, whitespace, and zoning