Fixed DrawElement, fix remove when node no longer exists