some improvement plus logging show-off