fix wrong assumptions, rework tokens distribution