integration of components, bugfixing