everything ist working up to e. sorry for the messy commit, lots of finetuning here.
done