More support to work anywhere in the DOM.

bug fixes