Many new descriptions and fixes