unauthorized logs & some more improvements