more vars added, and comments for concerns