updates for maverick (this might break for other OS X users, so let's just see if anybody reports bugs)