fixed logs and few bugs again