Fix some missing options in --usage Remove a few debugging statements Resolves 430704
Resolves 430243