check tgkill error
lower timeout wait
minor cleanup