Content changes
Multipel fixes
Boilerplates