update to element and some more internal changes