diff --git a/EndGamePrompt.java b/EndGamePrompt.java
index 23cad1a..39e0f14 100644
--- a/EndGamePrompt.java
+++ b/EndGamePrompt.java
@@ -39,8 +39,6 @@ public EndGamePrompt( String partyName ) {
         JPanel buttonPanel = new JPanel();
         buttonPanel.setLayout(new GridLayout(1, 2));
 
-        Insets buttonMargin = new Insets(4, 4, 4, 4);
-
 		EndGamePromptClickEvent listener = new EndGamePromptClickEvent();
 
         yesButton = createButton("Yes", listener);
diff --git a/EndGameReport.java b/EndGameReport.java
index 676c21b..b2e89a1 100644
--- a/EndGameReport.java
+++ b/EndGameReport.java
@@ -19,9 +19,8 @@ public class EndGameReport {
 	private ButtonCommand command;
 	private JFrame win;
 	private JButton printButton, finished;
-	private JList memberList;
-	private Vector myVector;
-	private Vector retVal;
+	private JList<String> memberList;
+	private Vector<String> retVal;
 	private int result;
 
 	private String selectedMember;
@@ -29,7 +28,7 @@ public class EndGameReport {
 	public EndGameReport( String partyName, Party party ) {
 	
 		result =0;
-		retVal = new Vector();
+		retVal = new Vector<String>();
 		win = new JFrame("End Game Report for " + partyName + "?" );
 		win.getContentPane().setLayout(new BorderLayout());
 		((JPanel) win.getContentPane()).setOpaque(false);
@@ -42,13 +41,13 @@ public EndGameReport( String partyName, Party party ) {
 		partyPanel.setLayout(new FlowLayout());
 		partyPanel.setBorder(new TitledBorder("Party Members"));
 		
-		Vector myVector = new Vector();
-		Iterator iter = (party.getMembers()).iterator();
+		Vector<String> myVector = new Vector<String>();
+		Iterator<Bowler> iter = (party.getMembers()).iterator();
 		while (iter.hasNext()){
-			myVector.add( ((Bowler)iter.next()).getNick() );
+			myVector.add((iter.next()).getNick());
 		}	
 		EndGameReportClickEvent listener = new EndGameReportClickEvent();
-		memberList = new JList(myVector);
+		memberList = new JList<String>(myVector);
 		memberList.setFixedCellWidth(120);
 		memberList.setVisibleRowCount(5);
 		memberList.addListSelectionListener(listener);
@@ -92,7 +91,7 @@ public void buttonPressed() {
         command.execute();
     }
 
-	public Vector waitForResult() {
+	public Vector<String> waitForResult() {
 		while ( result == 0 ) {
 			try {
 				Thread.sleep(10);
@@ -115,11 +114,11 @@ public void setResultNumber(int i) {
 	public JFrame getWin(){
 		return win;
 	}
-	public Vector getretVal(){
+	public Vector<String> getretVal(){
 		return retVal;
 	}
 	public static void main( String args[] ) {
-		Vector bowlers = new Vector();
+		Vector<Bowler> bowlers = new Vector<Bowler>();
 		for ( int i=0; i<4; i++ ) {
 			bowlers.add( new Bowler( "aaaaa", "aaaaa", "aaaaa" ) );
 		}
@@ -140,8 +139,11 @@ public void actionPerformed(ActionEvent e) {
 			buttonPressed();
 		}
 		public void valueChanged(ListSelectionEvent e) {
-			selectedMember =
-				((String) ((JList) e.getSource()).getSelectedValue());
+			if (e.getSource() instanceof JList) {
+				JList<?> source = (JList<?>) e.getSource();
+				selectedMember = (String) source.getSelectedValue();
+			}
+			
 		}
 	}
 }
\ No newline at end of file
diff --git a/Party.java b/Party.java
index ffee79e..ac083d3 100644
--- a/Party.java
+++ b/Party.java
@@ -27,7 +27,7 @@
 public class Party {
 
 	/** Vector of bowlers in this party */	
-    private Vector myBowlers;
+    private Vector<Bowler> myBowlers;
 	
 	/**
 	 * Constructor for a Party
@@ -35,8 +35,8 @@ public class Party {
 	 * @param bowlers	Vector of bowlers that are in this party
 	 */
 		
-    public Party( Vector bowlers ) {
-		myBowlers = new Vector(bowlers);
+    public Party( Vector<Bowler> bowlers ) {
+		myBowlers = new Vector<Bowler>(bowlers);
     }
 
 	/**
@@ -45,7 +45,7 @@ public Party( Vector bowlers ) {
 	 * @return 	A vector of the bowlers in this party
 	 */
 
-    public Vector getMembers() {
+    public Vector<Bowler> getMembers() {
 		return myBowlers;
     }
 
diff --git a/ScoreHistoryFile.java b/ScoreHistoryFile.java
index 43e9fff..01ce206 100644
--- a/ScoreHistoryFile.java
+++ b/ScoreHistoryFile.java
@@ -24,9 +24,9 @@ public void addScore(String nick, String date, String score)
 		out.close();
 	}
 
-	public Vector getScores(String nick)
+	public Vector<Score> getScores(String nick)
 		throws IOException, FileNotFoundException {
-		Vector scores = new Vector();
+		Vector<Score> scores = new Vector<Score>();
 
 		BufferedReader in =
 			new BufferedReader(new FileReader(SCOREHISTORY_DAT));
diff --git a/ScoreReport.java b/ScoreReport.java
index eb11bbd..36fede6 100644
--- a/ScoreReport.java
+++ b/ScoreReport.java
@@ -12,13 +12,13 @@ public class ScoreReport {
 	public ScoreReport( Bowler bowler, int[] scores, int games) {
 		String nick = bowler.getNick();
 		String full = bowler.getFullName();
-		Vector v = null;
+		Vector<Score> v = null;
 		ScoreHistoryFile shf = new ScoreHistoryFile();
 		try{
 			v = shf.getScores(nick);
 		} catch (Exception e){System.err.println("Error: " + e);}
 		
-		Iterator scoreIt = v.iterator();
+		Iterator<Score> scoreIt = v.iterator();
 		
 		content = "";
 		content += "--Lucky Strike Bowling Alley Score Report--\n";