moved more instance variables into headers