minor improvements, evaluation test