Fixed a big bug on how points where calculated. Now aggregations seem to be correct.
Nevertheless results are still wrong. Should check the incoming values. Results are too high!