boost timeout to 400 secs

And couple other minor tweaks