Minor changes to classes & index