More bug fixes - THERE'S A NODE