Authoring improvements

by James Peacock