fixes for stored components and gesture-component setup