fixes
Updated components