added McVerry 2000; cleanup