few tweaks after looking at logs