Updating gotchas and add some logging