Massive fixes to stage editing.