struct fix and new vars