fixed in_dom
removed todos and comments