refs #4996 some more improvements and fixes