bugfixes, initial web-components support