added aggregation functionality
bugfixes aggregation. Still some timezone issues