Bug fixes (related to the loading of the mcmc files) + Cosmetic changes.

(cherry picked from commit 832f8ee82f8f49830655afebeca052e3f86797be)