Many minor changes