Fixes for DOM
Removing TODOs
Merge branch 'domLayer'