A few more tweaks. =)