fix: a few fixes for components