General edit

Includes changes originally committed directly to master.