Adding a comment and changing some situations with the current_mesh