closes #5683 minor modifs