various
package.json, template fixes
merged