Many fixes for Peacock refs #2656