improvements to several components