Modify EnronParser.java ...and some others