added intelligent comments
nipped a future infinite loop in the bud