Many minor changes and corrections