fundamental fixes

The component should work now in the described way