update modules
minor fixes
merge
update node_modules & rebuild