a bit more work on dom handling.