Fixed bug in node install + some improvements