Continued minor tweaking.