Some changes. This comes closer to the actual data, but has apparently still some errors. MUST BE FIXED!