Fix tiny bugs and Modified logger strategy