small refactoring, better interface, implemented manual removal of components, bug fixes