Fixed build probs. and (some) typos in evaluation