Francis Brennan - 2005-06-25

Modified source files containing fixes