cleaned up meshwrapper a bit