fixes to some issues w/ the DOM