updated a few components
merging