Including a better resolution of the differences between the used measurement methods, apart from that a few minor fixes