A few missing pieces

Erin, 

here are 3 pieces I wanted to have in wq for a long time, in 4 commits. Please merge - I'll try to restart it on the astro cluster. Nothing controversial.