More clues added and some new debug statements