Improved Display and Tests.