Testbranch fixes#3

Plz merge