Fixed some MC counting and module dragging and dropping