more logs and fixed misplaced log