WIP: fixed all log related issues