Rebase4

couple of brainfarts I wasnt able to try out until now, should work