Some cleanup
Added mdclient2 some cmd options