Updated Board.java and Location.java