Node fixed and fully tested