Some tweaks

I will add other logging later.