Continued work on component library

and fixed a bug introduced at last update