Improved log and behavior on first run