refs #4564 some bugfixes, documentation and tests