minor changes to classes