more components, deploy fixes