Fixed & Added Some Logs