Update data to follow guidelines
Add some stuff