Contact info command now honors disclosure
style fixes