Fix descriptions and add new fields