Added some more in method and materials
Fixed a mergeconflict