merged fixes from Dario. upgraded npm modules.