update package.json
fix module loading
merge in changes