Fixed issue with pm2 and node enviorment along with other small changes