updated some comments and logging messages