updating some components and bug fixes