Merge in updates/improvements from rexmac.com