mc: fix & cleanup & version bumped