edits to make def!struct work

Also changes to ensure that all defvar have two args