Minor fixes

Adding option for the different specification of the data directory on
a PC or a Mac.