debug info/usage format fixes