adjust logging and other finetune