further thinning of code, request number overrrun fixed