Changed some names, added more content items