Some more tweeks to address various raised issues.