HLA-11:
- added toString() where appropriate
- fixed some Sonar issues