fixing some more component weirdness
fixing some more component weirdness