minor updates

fixed comments, logging traces etc.