cleanup some warnings, added root node as 'empty' case