Fixed convention checking
(Define) Bugfix XMLDomain, forgot Facade
cleaned up
more cleaning up
merge fixes and new helpers impl