[UPDATE] remove console.log + other corrections