- Added definitions for each built-in components
- minor fixes