adds shrinkwrap
adds a new field "engines"
completes basic templates
fixes conflicts