Style and structure changes, corrections