Bringing some changes back home

[quentinsf]

Howdy - thought you might like to incorporate a couple of fixes from me and from others. Feel free to ignore.

I think it probably needs updating again for Mavericks... when I get a chance...

Best, Q