Also minor fixes and speed enhancement (not measured).
Attach a file by drag & drop or click to upload
