Various fixes after I started testing,... first test seems to run now..