renamed sample pref files to be a little more generic
added some logging
Merge branch 'master' into safaba