Fixed mod issue and comments