commit maart12 16.29

fully working, code simplified not adjusted