Finished evaluation, other improvements