more fixes and adding components