Add additional log statements, small fix