Mate 1.5 cleanups and version bumps

Let me know what has to be corrected on infirit@gmail.com