Added a few bug fixes and changed an attribute name on the Component list