cleaned up mesh args

This fixes issues #384 and #395