Also, clean up a few interfaces that looked awkward when writing docs.
Attach a file by drag & drop or click to upload
