Add mversion and fix version numbers