Tweak Shake script to improve reliability of output.
Fill out some missing haddocks.