A few more tweaks.
20130227 build.