Strip credential from being shown
Assorted improvements