* Adding some more logs More logs are always better! Joke aside, these logs help to debug certain issues. * Apply suggestions from code review