- added aggregation functions
- added some JavaDoc