Merge of branch 'medale', as everything works, and the only negative values are those which are supposed to be where they are.

Everything works, the only negative values are those which are supposed to be where they are