Added more information
Updated some entries
Structure unchanged.