Multiple changes

- Minor bug fixes.
- Reimplemented the component::uid member.