Fixed up preparation and evaluation scripts.